Redesign message format

[khatus.git] / src / awk / lib / msg_out.awk

diff --git a/src/awk/lib/msg_out.awk b/src/awk/lib/msg_out.awk
index 6f5f945..24393c6 100755 (executable)
--- a/src/awk/lib/msg_out.awk
+++ b/src/awk/lib/msg_out.awk
@@ -1,29 +1,58 @@
 BEGIN {
-    OFS = Msg_fs ? Msg_fs : "|"
-    Kfs = Key_fs ? Key_fs : ":"
+    FS1 = "|"  # Fiels separator, level 1 (record to fields)
+    FS2 = ":"  # Fiels separator, level 2 (field to subfields
+
+    OFS = FS1
+    Kfs = FS2
+}
+
+# -----------------------------------------------------------------------------
+# alert
+# -----------------------------------------------------------------------------
+function msg_out_alert_low(subject, body) {
+    msg_out_alert("low", subject, body)
+}
+
+function msg_out_alert_med(subject, body) {
+    msg_out_alert("med", subject, body)
 }
 
-function msg_out_ok_alert(priority, subject, body,    key, val) {
+function msg_out_alert_hi(subject, body) {
+    msg_out_alert("hi", subject, body)
+}
+
+function msg_out_alert(priority, subject, body) {
     # priority : "low" | "med" | "hi"
     # subject  : string without spaces
     # body     : anything
-    key = "alert" Kfs priority Kfs subject
-    val = body
-    msg_out_ok(key, val)
+    print(Node, Module, "alert", priority, subject, body)
+}
+
+# -----------------------------------------------------------------------------
+# log
+# -----------------------------------------------------------------------------
+function msg_out_log_info(location, msg) {
+    msg_out_log("info", location, msg)
 }
 
-function msg_out_ok(key, val) {
-    msg_out("OK", key, val, "/dev/stdout")
+function msg_out_log_error(location, msg) {
+    msg_out_log("error", location, msg)
 }
 
-function msg_out_info(location, msg) {
-    msg_out("INFO", location, msg, "/dev/stderr")
+function msg_out_log(level, location, msg) {
+    print(Node, Module, "log", location, level, msg) > "/dev/stderr"
 }
 
-function msg_out_error(location, msg) {
-    msg_out("ERROR", location, msg, "/dev/stderr")
+# -----------------------------------------------------------------------------
+# status_bar
+# -----------------------------------------------------------------------------
+function msg_out_status_bar(bar) {
+    print(Node, Module, "status_bar", bar)
 }
 
-function msg_out(status, key, val, channel) {
-    print(status, Module, key, val) > channel
+# -----------------------------------------------------------------------------
+# data
+# -----------------------------------------------------------------------------
+function msg_out_data(key, val) {
+    print(Node, Module, "data", key, val)
 }