made database query less verbose

totoro
1 parent 6b53abab
Showing 2 changed files with 28 additions and 11 deletions Show diff stats
database/db_utils.anubis
net_services_protocols/logger_service.anubis
@@ -139,16 +139,17 @@ public define SQLite3QueryResult
     String            msg         //message to be shown if an error occure
   ) =
   //we try with 30 sec of timeout
+  //println(" executing [" + sql_query + "]");  
   with t0 = unow,
   if sql_query_timeout(db, sql_query, initial_bindings, 120, 100) is 
   {
     error(sql_error)  then  logError("DB", db_error(sql_error,msg) /*+ " executing [" + sql_query + "]"*/);
       //println(" executing [" + sql_query + "]");
-      __logQueries(t0, sql_query, msg);
+      //__logQueries(t0, sql_query, msg);
       __logLongQueries(t0, sql_query, msg);
       error(sql_error),
     ok(headers, cursor, reset) then  
-      __logQueries(t0, sql_query, msg);
+      //__logQueries(t0, sql_query, msg);
       __logLongQueries(t0, sql_query, msg);
       ok(headers, cursor, reset)
   }.
@@ -170,20 +171,21 @@ public define SQLite3Row
     String            msg         //message to be shown if an error occure
   ) =
   //we try with 60 sec of timeout with 
+  //println(" executing [" + msg + "]");  
   with t0 = unow,
   if sql_query_statement_timeout(sql_command_stmt, initial_bindings, 120, 100, msg) is 
   {
     error(sql_error)  then  logError("DB", db_error(sql_error,msg) /*+ " executing [" + sql_query + "]"*/);
-      //println(" executing [" + sql_query + "]");
-      __logQueries(t0, "stmt", msg);
+      //println(" executing [" + sql_command_stmt + "]");
+      //__logQueries(t0, "stmt", msg);
       __logLongQueries(t0, "stmt", msg);
       error(sql_error),
     no_more_row       then  
-      __logQueries(t0, "stmt", msg);
+      //__logQueries(t0, "stmt", msg);
       __logLongQueries(t0, "stmt", msg);
       no_more_row
     row(data)         then  
-      __logQueries(t0, "stmt", msg);
+      //__logQueries(t0, "stmt", msg);
       __logLongQueries(t0, "stmt", msg);
       row(data)
   }.
@@ -68,21 +68,31 @@ define Bool
   )=
   if find_string(msg, "LogString") is
   {
-    failure         then logError(log, "process_log can't find LogString");false,
+    failure             then 
+      //println("process_log can't find LogString");
+      logError(log, "process_log can't find LogString");false,
+      
     success(log_string) then
     if find_int32(msg, "Level") is
     {
-      failure         then logError(log, "process_log can't find Level");false,
+      failure             then 
+        //println("process_log can't find Level ["+log_string+"]");
+        logError(log, "process_log can't find Level");false,
       success(int_level)  then
         if find_int32(msg, "Thread") is
         {
-          failure         then logError(log, "process_log can't find Level");false,
+          failure             then 
+            //println("process_log can't find Thread ["+log_string+"]");
+            logError(log, "process_log can't find Thread");false,
           success(thread_id)  then
+            //println("*-*-> t["+thread_id+"] l["+int_level+"] s["+log_string+"]");
             with level = get_LogLevel_from_value(to_Int(int_level)),
             if level is logTrace then
                 if find_string(msg, "LogMask") is
                 {
-                  failure           then logError(log, "process_log can't find LogMask");false,
+                  failure           then 
+                    //println("process_log can't find LogMask ["+log_string+"]");
+                    logError(log, "process_log can't find LogMask");false,
                   success(log_mask) then logTrace(log, logMask(log_mask), log_string, thread_id); true
                 }
             else doLog(log, log_string, level, thread_id); true
@@ -198,9 +208,14 @@ define (UDP_Socket, ByteArray, Truncation, Word32, Word32) -&gt; One
   ) |->
   with ip = ip_addr_to_string(ip_address),
   logTrace(debug_logger, logMask("Logger"), "LoggerServer: data received (" + length(data) + " bytes) from IP " + ip + "... ");
+  //println("LoggerServer: data received (" + length(data) + " bytes) from IP " + ip + "... ");
+  //println("LoggerServer: data_preview " + data_preview(data, 20));
+
   if receive_message_from_io(make_data_io(data)) is
   {
-    failure then logWarning(debug_logger, "LoggerServer: Bad data packet received from IP " + ip + ": " + data_preview(data, 20)),
+    failure then 
+      //println("LoggerServer: Bad data packet received from IP " + ip + ": " + data_preview(data, 20));
+      logWarning(debug_logger, "LoggerServer: Bad data packet received from IP " + ip + ": " + data_preview(data, 20)),
     success(msg) then
       if *msg.what = _CXM_LOGGER_LOG then
         forget(process_log(logs, msg))