src: Migrate all logging to new interface versions .log -> .log.if [#41]

Author: jasraj

src/cron.q

@@ -37,7 +37,7 @@
 / NOTE: The initialistion function will not overwrite .z.ts if it is already set.
 .cron.init:{
     if[.ns.isSet `.z.ts;
-        .log.warn "Timer function is already set. Cron will not override automatically";
+        .log.if.warn "Timer function is already set. Cron will not override automatically";
         :(::);
     ];
 
@@ -56,7 +56,7 @@
         :(::);
     ];
 
-    .log.info "Enabling cron job scheduler [ Timer Interval: ",string[.cron.cfg.timerInterval]," ms ]";
+    .log.if.info "Enabling cron job scheduler [ Timer Interval: ",string[.cron.cfg.timerInterval]," ms ]";
 
     .util.system "t ",string .cron.cfg.timerInterval;
   };
@@ -67,8 +67,8 @@
         :(::);
     ];
 
-    .log.info "Disabling cron job scheduler";
-    .log.warn " No scheduled jobs will be executed until cron is enabled again";
+    .log.if.info "Disabling cron job scheduler";
+    .log.if.warn " No scheduled jobs will be executed until cron is enabled again";
 
     .util.system "t 0";
  };
@@ -88,32 +88,32 @@
 /  @throws InvalidCronJobTimeException If the start time specified is before the current time or the end time is before the start time
 .cron.add:{[func;args;runType;startTime;endTime;interval]
     if[not .ns.isSet func;
-        .log.error "Function to add to cron does not exist [ Function: ",string[func]," ]";
+        .log.if.error "Function to add to cron does not exist [ Function: ",string[func]," ]";
         '"FunctionDoesNotExistFunction";
     ];
 
     if[not .type.isFunction get func;
-        .log.error "Symbol reference for cron job is not a function [ Reference: ",string[func]," ]";
+        .log.if.error "Symbol reference for cron job is not a function [ Reference: ",string[func]," ]";
         '"ReferenceIsNotAFunctionException";
     ];
 
     if[not runType in key .cron.cfg.runners;
-        .log.error "Invalid cron run type. Expecting one of: ",.convert.listToString key .cron.cfg.runners;
+        .log.if.error "Invalid cron run type. Expecting one of: ",.convert.listToString key .cron.cfg.runners;
         '"InvalidCronRunTypeException";
     ];
 
     if[startTime < .time.today[]+`second$.time.nowAsTime[];
-        .log.error "Cron job start time is in the past. Cannot add job";
+        .log.if.error "Cron job start time is in the past. Cannot add job";
         '"InvalidCronJobTimeException";
     ];
 
     if[not[.util.isEmpty endTime] & endTime < startTime;
-        .log.error "Cron job end time specified is before the start time. Cannot add job";
+        .log.if.error "Cron job end time specified is before the start time. Cannot add job";
         '"InvalidCronJobTimeException";
     ];
 
     if[not[.util.isEmpty interval] & .cron.cfg.timerInterval > .convert.timespanToMs interval;
-        .log.error "Cron job repeat interval is shorter than the cron timer interval. Cannot add job";
+        .log.if.error "Cron job repeat interval is shorter than the cron timer interval. Cannot add job";
         '"InvalidCronJobIntervalException";
     ];
 
@@ -200,7 +200,7 @@
     jobDetails:.cron.jobs jobId;
 
     if[.type.isInfinite jobDetails`nextRunTime;
-        .log.debug "Job has been self-cancelled. Will not reschedule [ Job: ",string[jobId]," ]";
+        .log.if.debug "Job has been self-cancelled. Will not reschedule [ Job: ",string[jobId]," ]";
         :status;
     ];
 
@@ -231,7 +231,7 @@
     status:1b;
 
     if[.ns.const.pExecFailure ~ first result;
-        .log.error "Cron job failed to execute [ Job ID: ",string[jobId]," ]. Error - ",last result;
+        .log.if.error "Cron job failed to execute [ Job ID: ",string[jobId]," ]. Error - ",last result;
         status:0b;
 
         result:(`errorMsg`backtrace inter key result)#result;

src/csv.q

@@ -17,7 +17,7 @@
     '"IllegalArgumentException";
   ];
 
-  .log.info"Loading CSV file ",.convert.hsymToString path;
+  .log.if.info"Loading CSV file ",.convert.hsymToString path;
 
   :.csv.parse[types;read0 path];
  };
@@ -60,7 +60,7 @@
         '"UnsupportedColumnTypeException (",.convert.listToString[where unsupported],")";
     ];
 
-    .log.info "Saving CSV file [ Target: ",string[path]," ] [ Table Length: ",string[count data]," ]";
+    .log.if.info "Saving CSV file [ Target: ",string[path]," ] [ Table Length: ",string[count data]," ]";
 
     :path 0: "," 0: data;
  };

src/event.q

@@ -45,18 +45,18 @@
     listeners:.event.handlers event;
 
     if[0=count listeners;
-        .log.debug "Event fired but no listeners [ Event: ",string[event]," ] [ Args: ",.Q.s1[args]," ]";
+        .log.if.debug "Event fired but no listeners [ Event: ",string[event]," ] [ Args: ",.Q.s1[args]," ]";
         :(::);
     ];
 
-    .log.debug "Notifying listeners of event [ Event: ",string[event]," ] [ Args: ",.Q.s1[args]," ]";
+    .log.if.debug "Notifying listeners of event [ Event: ",string[event]," ] [ Args: ",.Q.s1[args]," ]";
 
     listenRes:listeners!.ns.protectedExecute[;args] each listeners;
     listenErr:where .ns.const.pExecFailure~/:first each listenRes;
 
     if[0 < count listenErr;
-        .log.warn "One or more listeners failed to execute successfully [ Event: ",string[event]," ] [ Errored: ",.convert.listToString[listenErr]," ]";
-        .log.warn "Listener exception detail:\n",.Q.s listenErr#last each listenRes;
+        .log.if.warn "One or more listeners failed to execute successfully [ Event: ",string[event]," ] [ Errored: ",.convert.listToString[listenErr]," ]";
+        .log.if.warn "Listener exception detail:\n",.Q.s listenErr#last each listenRes;
         :(::);
     ];
  };
@@ -76,17 +76,17 @@
     ];
 
     if[not event in key .event.handlers;
-        .log.info "New event type to be added for management [ Event: ",string[event]," ]";
+        .log.if.info "New event type to be added for management [ Event: ",string[event]," ]";
     ];
 
     if[listenFunction in .event.handlers event;
-        .log.debug "Listener already added for event. Will not re-add [ Event: ",string[event]," ] [ Listener: ",string[listenFunction]," ]";
+        .log.if.debug "Listener already added for event. Will not re-add [ Event: ",string[event]," ] [ Listener: ",string[listenFunction]," ]";
         :(::);
     ];
 
     .event.handlers[event],:listenFunction;
 
-    .log.info "New listener added for event [ Event: ",string[event]," ] [ Listener: ",string[listenFunction]," ]";
+    .log.if.info "New listener added for event [ Event: ",string[event]," ] [ Listener: ",string[listenFunction]," ]";
  };
 
 / Removes the listener from the specified event
@@ -103,7 +103,7 @@
 
     .event.handlers[event]:.event.handlers[event] except listenFunction;
 
-    .log.info "Removed listener from event [ Event: ",string[event]," ] [ Listener: ",string[listenFunction]," ]";
+    .log.if.info "Removed listener from event [ Event: ",string[event]," ] [ Listener: ",string[listenFunction]," ]";
  };
 
 / Binds an event to a specific function so the event management library can be used with it. This is generally
@@ -113,7 +113,7 @@
 /  @param bindFunction (Symbol) Reference to the function that should be set
 .event.installHandler:{[event;bindFunction]
     if[.ns.isSet bindFunction;
-        .log.warn "Function to bind event management to is already set. Will not override [ Function: ",string[bindFunction]," ]";
+        .log.if.warn "Function to bind event management to is already set. Will not override [ Function: ",string[bindFunction]," ]";
         :(::);
     ];
 
@@ -123,12 +123,12 @@
         .event.handlers[event]:`symbol$();
     ];
 
-    .log.info "Event management now enabled [ Event: ",string[event]," ] [ Bound To: ",string[bindFunction]," ]";
+    .log.if.info "Event management now enabled [ Event: ",string[event]," ] [ Bound To: ",string[bindFunction]," ]";
  };
 
 .event.i.defaultExitHandler:{[ec]
     $[0=ec;
-        .log.info "Process is exiting at ",string[.time.now[]]," [ Exit Code: ",string[ec]," ]";
-        .log.fatal "Process is exiting at ",string[.time.now[]]," with non-zero exit code [ Exit Code: ",string[ec]," ]"
+        .log.if.info "Process is exiting at ",string[.time.now[]]," [ Exit Code: ",string[ec]," ]";
+        .log.if.fatal "Process is exiting at ",string[.time.now[]]," with non-zero exit code [ Exit Code: ",string[ec]," ]"
     ];
  };

src/file.q

@@ -61,7 +61,7 @@
 /  @returns (FolderPath) The supplied folder to check
 .file.ensureDir:{[dir]
     if[not .type.isFolder dir;
-        .log.info "Directory does not exist, creating [ Directory: ",string[dir]," ]";
+        .log.if.info "Directory does not exist, creating [ Directory: ",string[dir]," ]";
         .os.run[`mkdir;.convert.hsymToString dir];
     ];
 

src/http.q

@@ -62,7 +62,7 @@
 
 .http.init:{
     if[.http.cfg.cacheProxy;
-        .log.info "Querying environment variables for HTTP / HTTPS proxy settings";
+        .log.if.info "Querying environment variables for HTTP / HTTPS proxy settings";
         .http.proxy:.http.i.getProxyConfig[];
     ];
 
@@ -71,11 +71,11 @@
             .http.userAgent:"-" sv string `kdbplus,.z.K,.z.k,.z.i;
         ];
 
-        .log.info "Send user agent with HTTP requests enabled [ User Agent: ",.http.userAgent," ]";
+        .log.if.info "Send user agent with HTTP requests enabled [ User Agent: ",.http.userAgent," ]";
     ];
 
     .http.gzAvailable:.ns.isSet `.Q.gz;
-    .log.info "HTTP compression with GZIP [ Available: ",string[`no`yes .http.gzAvailable]," ]";
+    .log.if.info "HTTP compression with GZIP [ Available: ",string[`no`yes .http.gzAvailable]," ]";
  };
 
 
@@ -154,7 +154,7 @@
         location:response[`headers] key[response`headers] first where `location = lower key response`headers;
 
         if[0 < count location;
-            .log.info "Following HTTP redirect as configured [ Original URL: ",url," ] [ New URL: ",location," ]";
+            .log.if.info "Following HTTP redirect as configured [ Original URL: ",url," ] [ New URL: ",location," ]";
             response:.http.send[method; location; body; contentType; headers];
         ];
     ];
@@ -188,7 +188,7 @@
         urlArgs:"=" vs/: "&" vs urlArgs;
 
         if[not all 2 = count each urlArgs;
-            .log.error "URL query string is invalid, must be ampersand separated 'key=value' pairs [ URL: ",urlParts[`path]," ]";
+            .log.if.error "URL query string is invalid, must be ampersand separated 'key=value' pairs [ URL: ",urlParts[`path]," ]";
             '"InvalidUrlQueryStringException";
         ];
 
@@ -269,24 +269,24 @@
 .http.i.send:{[urlParts; requestStr]
     if[any urlParts[`scheme] like/: string[.http.cfg.tlsSchemes],\:"://";
         if[not .util.isTlsAvailable[];
-            .log.error "Cannot open TLS-based connection as TLS is not available in the current process";
+            .log.if.error "Cannot open TLS-based connection as TLS is not available in the current process";
             '"TlsNotAvailableException";
         ];
     ];
 
     urlForLog:.http.i.urlForLog urlParts;
 
-    .log.info "Sending HTTP request [ URL: ",urlForLog," ] [ Via Proxy: ",string[`no`yes urlParts`proxy]," ]";
-    .log.trace "HTTP request:\n",requestStr;
+    .log.if.info "Sending HTTP request [ URL: ",urlForLog," ] [ Via Proxy: ",string[`no`yes urlParts`proxy]," ]";
+    .log.if.trace "HTTP request:\n",requestStr;
 
     httpResp:@[urlParts`hp; requestStr; { (`HTTP_REQUEST_FAIL; x) }];
 
     if[`HTTP_REQUEST_FAIL ~ first httpResp;
-        .log.error "Failed to connect to HTTP endpoint [ URL: ",urlForLog," ]. Error - ",last httpResp;
+        .log.if.error "Failed to connect to HTTP endpoint [ URL: ",urlForLog," ]. Error - ",last httpResp;
         '"HttpConnectionFailedException";
     ];
 
-    .log.info "HTTP request returned OK [ URL: ",urlForLog," ]";
+    .log.if.info "HTTP request returned OK [ URL: ",urlForLog," ]";
 
     :httpResp;
  };
@@ -344,16 +344,16 @@
     proxyHp:.http.proxy `$urlParts`scheme;
 
     if["" ~ proxyHp;
-        .log.trace "HTTP access request will route direct (no proxy config) [ Base URL: ",urlParts[`baseUrl]," ]";
+        .log.if.trace "HTTP access request will route direct (no proxy config) [ Base URL: ",urlParts[`baseUrl]," ]";
         :`proxy`hp!(0b; `$":",raze urlParts`scheme`baseUrl);
     ];
 
     if[urlParts[`baseUrl] in .http.proxy`bypass;
-        .log.trace "HTTP access request will bypass proxy due to 'NO_PROXY' match [ Base URL: ",urlParts[`baseUrl]," ]";
+        .log.if.trace "HTTP access request will bypass proxy due to 'NO_PROXY' match [ Base URL: ",urlParts[`baseUrl]," ]";
         :`proxy`hp!(0b; `$":",raze urlParts`scheme`baseUrl);
     ];
 
-    .log.trace "HTTP access request will route via proxy [ Base URL: ",urlParts[`baseUrl]," ] [ Proxy: ",proxyHp," ]";
+    .log.if.trace "HTTP access request will route via proxy [ Base URL: ",urlParts[`baseUrl]," ] [ Proxy: ",proxyHp," ]";
     :`proxy`hp!(1b; `$":",proxyHp);
  };
 
@@ -397,7 +397,7 @@
         ];
 
         if[not[.http.gzAvailable] | not "gzip" ~ ppHeaders`contentEncoding;
-            .log.error "Invalid content encoding in HTTP response [ Specified: ",ppHeaders[`contentEncoding]," ] [ Supported: ",string[`none`gzip .http.gzAvailable]," ]";
+            .log.if.error "Invalid content encoding in HTTP response [ Specified: ",ppHeaders[`contentEncoding]," ] [ Supported: ",string[`none`gzip .http.gzAvailable]," ]";
 
             if[.http.cfg.errorOnInvaildContentEncoding;
                 '"InvalidContentEncodingException";

src/if.q

@@ -75,7 +75,7 @@
 /  @throws ImplementationFunctionDoesNotExistException If the implementation function is a reference but doesn't exist
 /  @throws InvalidImplementationFunctionException If the implementation function is a reference to something that isn't a function
 .if.i.bindFunction:{[ifFunc; implFunc; overwrite]
-    if[not 1 = count key ifFunc;
+    if[not 0 = count key ifFunc;
         if[not overwrite;
             .if.i.log[`info;] "Interface: Not overwriting existing implementation for interface [ Interface: ",string[ifFunc]," ]";
             :(::);

src/ipc.q

@@ -92,16 +92,16 @@
         ];
     ];
 
-    .log.info "Attempting to connect to ",logHostPort," (timeout ",string[timeout]," ms)";
+    .log.if.info "Attempting to connect to ",logHostPort," (timeout ",string[timeout]," ms)";
 
     h:@[hopen; (hostPort; timeout); { (`CONN_FAIL;x) }];
 
     if[`CONN_FAIL~first h;
-        .log.error "Failed to connect to ",logHostPort,". Error - ",last h;
+        .log.if.error "Failed to connect to ",logHostPort,". Error - ",last h;
         '"ConnectionFailedException (",logHostPort,")";
     ];
 
-    .log.info "Successfully connected to ",logHostPort," on handle ",string h;
+    .log.if.info "Successfully connected to ",logHostPort," on handle ",string h;
 
     `.ipc.outbound upsert (h; `$logHostPort; .time.now[]);
 
@@ -118,7 +118,7 @@
     .ipc.i.connectionClosed h;
 
     if[`FAILED_TO_CLOSE~first closeRes;
-        .log.warn "Failed to close handle ",string[h],". Error - ",last closeRes;
+        .log.if.warn "Failed to close handle ",string[h],". Error - ",last closeRes;
         :0b;
     ];
 
@@ -130,7 +130,7 @@
 /  @see .ipc.i.handleOpen
 /  @see .ipc.i.connectionClosed
 .ipc.i.enableInboundConnTracking:{
-    .log.info "Enabling inbound connection tracking";
+    .log.if.info "Enabling inbound connection tracking";
 
     / Optional dependency if inbound connection tracking required. Otherwise event is not loaded
     .require.lib`event;
@@ -160,7 +160,7 @@
     sourceIp:.convert.ipOctalToSymbol .z.a;
     user:`unknown^.z.u;
 
-    .log.info "New inbound ",string[connectType]," connection on handle ",string[h]," [ IP Address: ",string[sourceIp]," ] [ User: ",string[user]," ]";
+    .log.if.info "New inbound ",string[connectType]," connection on handle ",string[h]," [ IP Address: ",string[sourceIp]," ] [ User: ",string[user]," ]";
 
     `.ipc.inbound upsert (h;sourceIp;user;.time.now[];connectType);
  };
@@ -172,12 +172,12 @@
 .ipc.i.connectionClosed:{[h]
     if[h in key .ipc.inbound;
         hDetail:.ipc.inbound h;
-        .log.info "Inbound connection on handle ",string[h]," closed [ IP Address: ",string[hDetail`sourceIp]," ] [ User: ",string[hDetail`user]," ]";
+        .log.if.info "Inbound connection on handle ",string[h]," closed [ IP Address: ",string[hDetail`sourceIp]," ] [ User: ",string[hDetail`user]," ]";
         delete from `.ipc.inbound where handle = h;
     ];
 
     if[h in key .ipc.outbound;
-        .log.info "Outbound connection on handle ",string[h]," closed";
+        .log.if.info "Outbound connection on handle ",string[h]," closed";
         delete from `.ipc.outbound where handle = h;
     ];
  };