Revert "Changed status to logLevel - Fixes #44"

This reverts commit 5ee5b61.
TanmoySG · Jun 17, 2022 · a9d03c5 · a9d03c5
1 parent 1a22931
commit a9d03c5
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/documentation/README.md b/documentation/README.md
@@ -71,15 +71,15 @@ ENDPOINT: localhost:8080/{publisher}/{context}/logs
 METHOD  : POST
 PAYLOAD : 
     {
-        "logLevel" : "WARN",
+        "status" : "WARN",
         "column1" : "Testing Logsmith",
         "column2" : "RESTClient",
         ...
     }
 ```
 Note:
 
-- Here, LogLevel is the the Priority of the Log and can have any value like - WARN, INFO, FAILURE, etc. 
+- Here, status is the LogLevel, i.e. the Priority of the Log and can have any value like - WARN, INFO, FAILURE, etc. 
 - A publisher can add timestamp from their own end, which overrides the system-set timestamp. 
 - If timestamp is not added to the log payload, system-generated timestamp is used.
 

diff --git a/handlers/contexts/context.js b/handlers/contexts/context.js
@@ -9,7 +9,7 @@ import { StandardizeIdentifier } from '../utilities/identifierUtility.js';
 
 const ContextRegistryTemplate = {}
 
-const defaultLogSchema = ["timestamp", "logLevel"]
+const defaultLogSchema = ["timestamp", "status"]
 const defaultMetricSchema = ["timestamp"]
 
 const logRegistryTemplate = {

diff --git a/handlers/contexts/validate.js b/handlers/contexts/validate.js
@@ -27,7 +27,7 @@ export function validateNewContext(newContext, ContextRegistry) {
 export function checkLogHasValidSchema(newContext) {
     if (Array.isArray(newContext["kind"]["logs"])) {
         if (newContext["kind"]["logs"].length > 0) {
-            if (newContext["kind"]["logs"].every(columnName => ["timestamp", "logLevel"].includes(columnName))) {
+            if (newContext["kind"]["logs"].every(columnName => ["timestamp", "status"].includes(columnName))) {
                 return false
             } else {
                 return true

diff --git a/handlers/handlers.js b/handlers/handlers.js
@@ -18,19 +18,19 @@ const logg1 = {
     "col1" : "test",
     "col2": "test2",
     "timestamp" : 123456,
-    "logLevel" : "WARN"
+    "status" : "WARN"
 }
 
 const logg2={
     "col1" : "test",
     "col2": "test2",
-    "logLevel" : "WARN"
+    "status" : "WARN"
 }
 
 const logg3={
     "col" : "test",
     "col2": "test2",
-    "logLevel" : "WARN"
+    "status" : "WARN"
 }
 
 registerNewLog(publisher, context,logg1, function (err) {

diff --git a/handlers/publishers/validate.js b/handlers/publishers/validate.js
@@ -7,10 +7,10 @@ export function validateExistingPublisher(publisher, PublisherRegistry) {
 }
 
 export function validateLog(LogBody) {
-    if (["context", "logLevel", "message"] in LogBody) {
+    if (["context", "status", "message"] in LogBody) {
         if (
             length(LogBody["context"]) != 0 &&
-            length(LogBody["logLevel"]) != 0 &&
+            length(LogBody["status"]) != 0 &&
             length(LogBody["message"]) != 0
         ) {
             return true

diff --git a/test/RESTSnippets.rest b/test/RESTSnippets.rest
@@ -39,7 +39,7 @@ POST {{host}}/{{publisher}}/{{context}}/logs HTTP/1.1
 content-type: application/json
 
 {
-    "logLevel" : "INFO",
+    "status" : "INFO",
     "message" : "Testing Logsmith",
     "mode" : "RESTClient"
 }
@@ -50,7 +50,7 @@ content-type: application/json
 
 {
     "timestamp" : {{$timestamp}},
-    "logLevel" : "WARN",
+    "status" : "WARN",
     "message" : "Testing Logsmith",
     "mode" : "RESTClient"
 }