pndnotifyd now uses pnd_logger to do its printf madness; cleans up the code nicely.

pndnotifyd now will look in 'apps' config for pndnotifyd.loglevel to set logging level, which
is otherwise default to '1' now. (0 includes debug info as well.)
Also added a couple things to pnd_logger

diff --git a/apps/pndnotifyd.c b/apps/pndnotifyd.c
index 70ab5ac..822c8f9 100644 (file)
--- a/apps/pndnotifyd.c
+++ b/apps/pndnotifyd.c
@@ -30,6 +30,7 @@
 #include "pnd_pxml.h"
 #include "pnd_utility.h"
 #include "pnd_desktop.h"
+#include "pnd_logger.h"
 
 // this piece of code was simpler once; but need to grow it a bit and in a rush
 // moving all these to globals rather than refactor the code a bit; tsk tsk..
@@ -37,6 +38,14 @@
 // op mode; emitting stdout or no?
 static unsigned char g_daemon_mode = 0;
 
+typedef enum {
+  pndn_debug = 0,
+  pndn_rem,          // will set default log level to here, so 'debug' is omitted
+  pndn_warning,
+  pndn_error,
+  pndn_none
+} pndnotify_loglevels_e;
+
 // like discotest
 char *configpath;
 char *appspath;
@@ -54,6 +63,9 @@ char *pndhup = NULL;  // full path to located pnd_hup.sh
 // notifier handle
 pnd_notify_handle nh = 0;
 
+// constants
+#define PNDNOTIFYD_LOGLEVEL "pndnotifyd.loglevel"
+
 // decl's
 void consume_configuration ( void );
 void setup_notifications ( void );
@@ -87,12 +99,21 @@ int main ( int argc, char *argv[] ) {
       exit ( 0 );
     }
 
-  }
+  } // for
 
-  if ( ! g_daemon_mode ) {
-    printf ( "Interval between checks is %u seconds\n", interval_secs );
+  /* enable logging?
+   */
+  if ( g_daemon_mode ) {
+    // nada
+  } else {
+    pnd_log_set_filter ( pndn_rem );
+    pnd_log_set_pretext ( "pndnotifyd" );
+    pnd_log_to_stdout();
+    pnd_log ( pndn_rem, "log level starting as %u", pnd_log_get_filter() );
   }
 
+  pnd_log ( pndn_rem, "Interval between checks is %u seconds\n", interval_secs );
+
   // basic daemon set up
   if ( g_daemon_mode ) {
 
@@ -103,7 +124,7 @@ int main ( int argc, char *argv[] ) {
 
     // detach from terminal
     if ( ( i = fork() ) < 0 ) {
-      printf ( "ERROR: Couldn't fork()\n" );
+      pnd_log ( pndn_error, "ERROR: Couldn't fork()\n" );
       exit ( i );
     }
     if ( i ) {
@@ -124,13 +145,11 @@ int main ( int argc, char *argv[] ) {
   /* startup
    */
 
-  if ( ! g_daemon_mode ) {
-    printf ( "Apps searchpath is '%s'\n", appspath );
-    printf ( "PXML overrides searchpath is '%s'\n", overridespath );
-    printf ( ".desktop files emit to '%s'\n", dotdesktoppath );
-    printf ( ".desktop icon files emit to '%s'\n", iconpath );
-    printf ( "Notify searchpath is '%s'\n", notifypath );
-  }
+  pnd_log ( pndn_rem, "Apps searchpath is '%s'\n", appspath );
+  pnd_log ( pndn_rem, "PXML overrides searchpath is '%s'\n", overridespath );
+  pnd_log ( pndn_rem, ".desktop files emit to '%s'\n", dotdesktoppath );
+  pnd_log ( pndn_rem, ".desktop icon files emit to '%s'\n", iconpath );
+  pnd_log ( pndn_rem, "Notify searchpath is '%s'\n", notifypath );
 
   /* set up signal handler
    */
@@ -172,10 +191,8 @@ int main ( int argc, char *argv[] ) {
       // by this point, the watched directories have notified us that something of relevent
       // has occurred; we should be clever, but we're not, so just re-brute force the
       // discovery and spit out .desktop files..
-      if ( ! g_daemon_mode ) {
-       printf ( "------------------------------------------------------\n" );
-       printf ( "Changes within watched paths .. performing re-discover!\n" );
-      }
+      pnd_log ( pndn_rem, "------------------------------------------------------\n" );
+      pnd_log ( pndn_rem, "Changes within watched paths .. performing re-discover!\n" );
 
       // run the discovery
       applist = pnd_disco_search ( appspath, overridespath );
@@ -186,9 +203,7 @@ int main ( int argc, char *argv[] ) {
 
        while ( d ) {
 
-         if ( ! g_daemon_mode ) {
-           printf ( "Found app: %s\n", pnd_box_get_key ( d ) );
-         }
+         pnd_log ( pndn_rem, "Found app: %s\n", pnd_box_get_key ( d ) );
 
          // check if icon already exists (from a previous extraction say); if so, we needn't
          // do it again
@@ -199,9 +214,7 @@ int main ( int argc, char *argv[] ) {
          if ( stat ( existingpath, &dirs ) == 0 ) {
            // icon seems to exist, so just crib the location into the .desktop
 
-           if ( ! g_daemon_mode ) {
-             printf ( "  Found icon already existed, so reusing it! %s\n", existingpath );
-           }
+           pnd_log ( pndn_rem, "  Found icon already existed, so reusing it! %s\n", existingpath );
 
            if ( d -> icon ) {
              free ( d -> icon );
@@ -211,9 +224,7 @@ int main ( int argc, char *argv[] ) {
          } else {
            // icon seems unreadable or does not exist; lets try to create it..
 
-           if ( ! g_daemon_mode ) {
-             printf ( "  Icon not already present, so trying to write it! %s\n", existingpath );
-           }
+           pnd_log ( pndn_rem, "  Icon not already present, so trying to write it! %s\n", existingpath );
 
            // attempt to create icon files; if successful, alter the disco struct to contain new
            // path, otherwise leave it alone (since it could be a generic icon reference..)
@@ -224,9 +235,7 @@ int main ( int argc, char *argv[] ) {
              }
              d -> icon = strdup ( existingpath );
            } else {
-             if ( ! g_daemon_mode ) {
-               printf ( "  WARN: Couldn't write out icon %s\n", existingpath );
-             }
+             pnd_log ( pndn_rem, "  WARN: Couldn't write out icon %s\n", existingpath );
            }
 
          } // icon already exists?
@@ -240,9 +249,7 @@ int main ( int argc, char *argv[] ) {
            pnd_notify_watch_path ( nh, buffer, PND_NOTIFY_RECURSE );
 #endif
          } else {
-           if ( ! g_daemon_mode ) {
-             printf ( "ERROR: Error creating .desktop file for app: %s\n", pnd_box_get_key ( d ) );
-           }
+           pnd_log ( pndn_rem, "ERROR: Error creating .desktop file for app: %s\n", pnd_box_get_key ( d ) );
          }
 
          // next!
@@ -252,9 +259,7 @@ int main ( int argc, char *argv[] ) {
 
       } else {
 
-       if ( ! g_daemon_mode ) {
-         printf ( "No applications found in search path\n" );
-       }
+       pnd_log ( pndn_rem, "No applications found in search path\n" );
 
       } // got apps?
 
@@ -305,15 +310,12 @@ int main ( int argc, char *argv[] ) {
            }
            if ( source_libpnd ) {
 #if 0
-             if ( ! g_daemon_mode ) {
-               printf ( "File '%s' appears to have been created by libpnd so candidate for delete: %u\n", buffer, source_libpnd );
-             }
+             pnd_log ( pndn_rem,
+                       "File '%s' appears to have been created by libpnd so candidate for delete: %u\n", buffer, source_libpnd );
 #endif
            } else {
 #if 0
-             if ( ! g_daemon_mode ) {
-               printf ( "File '%s' appears NOT to have been created by libpnd, so leave it alone\n", buffer );
-             }
+             pnd_log ( pndn_rem, "File '%s' appears NOT to have been created by libpnd, so leave it alone\n", buffer );
 #endif
              continue; // skip deleting it
            }
@@ -322,9 +324,7 @@ int main ( int argc, char *argv[] ) {
            if ( stat ( buffer, &dirs ) == 0 ) {
              if ( dirs.st_mtime >= createtime ) {
 #if 0
-               if ( ! g_daemon_mode ) {
-                 printf ( "File '%s' seems 'new', so leave it alone.\n", buffer );
-               }
+               pnd_log ( pndn_rem, "File '%s' seems 'new', so leave it alone.\n", buffer );
 #endif
                continue; // skip deleting it
              }
@@ -332,9 +332,7 @@ int main ( int argc, char *argv[] ) {
 
            // by this point, the .desktop file must be 'old' and created by pndnotifyd
            // previously, so can remove it
-           if ( ! g_daemon_mode ) {
-             printf ( "File '%s' seems nolonger relevent; removing it.\n", dirent -> d_name );
-           }
+           pnd_log ( pndn_rem, "File '%s' seems nolonger relevent; removing it.\n", dirent -> d_name );
            unlink ( buffer );
 
          } // while getting filenames from dir
@@ -346,9 +344,7 @@ int main ( int argc, char *argv[] ) {
 
       // if we've got a hup script located, lets invoke it
       if ( pndhup ) {
-       if ( ! g_daemon_mode ) {
-         printf ( "Invoking hup script '%s'.\n", pndhup );
-       }
+       pnd_log ( pndn_rem, "Invoking hup script '%s'.\n", pndhup );
        pnd_exec_no_wait_1 ( pndhup, NULL );
       }
 
@@ -443,6 +439,11 @@ void consume_configuration ( void ) {
       run_script = PND_PNDRUN_FILENAME;
     }
 
+    if ( pnd_conf_get_as_int ( apph, PNDNOTIFYD_LOGLEVEL ) != PND_CONF_BADNUM ) {
+      pnd_log_set_filter ( pnd_conf_get_as_int ( apph, PNDNOTIFYD_LOGLEVEL ) );
+      pnd_log ( pndn_rem, "config file causes loglevel to change to %u", pnd_log_get_filter() );
+    }
+
   } else {
     run_searchpath = NULL;
     run_script = NULL;
@@ -479,15 +480,13 @@ void consume_configuration ( void ) {
   }
 
   // debug
-  if ( ! g_daemon_mode ) {
-    if ( run_searchpath ) printf ( "Locating pnd run in %s\n", run_searchpath );
-    if ( run_script ) printf ( "Locating pnd runscript as %s\n", run_script );
-    if ( pndrun ) printf ( "pndrun is %s\n", pndrun );
-    if ( pndhup ) {
-      printf ( "pndhup is %s\n", pndhup );
-    } else {
-      printf ( "No pndhup found (which is fine.)\n" );
-    }
+  if ( run_searchpath ) pnd_log ( pndn_rem, "Locating pnd run in %s\n", run_searchpath );
+  if ( run_script ) pnd_log ( pndn_rem, "Locating pnd runscript as %s\n", run_script );
+  if ( pndrun ) pnd_log ( pndn_rem, "pndrun is %s\n", pndrun );
+  if ( pndhup ) {
+    pnd_log ( pndn_rem, "pndhup is %s\n", pndhup );
+  } else {
+    pnd_log ( pndn_rem, "No pndhup found (which is fine.)\n" );
   }
 
   /* handle globbing or variable substitution
@@ -523,25 +522,18 @@ void setup_notifications ( void ) {
   }
 
   if ( ! nh ) {
-    if ( ! g_daemon_mode ) {
-      printf ( "INOTIFY failed to init.\n" );
-    }
+    pnd_log ( pndn_rem, "INOTIFY failed to init.\n" );
     exit ( -1 );
   }
 
 #if 0
-  if ( ! g_daemon_mode ) {
-    printf ( "INOTIFY is up.\n" );
-  }
+  pnd_log ( pndn_rem, "INOTIFY is up.\n" );
 #endif
 
   SEARCHPATH_PRE
   {
 
-    if ( ! g_daemon_mode ) {
-      printf ( "Watching path '%s' and its descendents.\n", buffer );
-    }
-
+    pnd_log ( pndn_rem, "Watching path '%s' and its descendents.\n", buffer );
     pnd_notify_watch_path ( nh, buffer, PND_NOTIFY_RECURSE );
 
   }
@@ -552,9 +544,7 @@ void setup_notifications ( void ) {
 
 void sighup_handler ( int n ) {
 
-  if ( ! g_daemon_mode ) {
-    printf ( "---[ SIGHUP received ]---\n" );
-  }
+  pnd_log ( pndn_rem, "---[ SIGHUP received ]---\n" );
 
   // reparse config files
   consume_configuration();

diff --git a/deployment/etc/pandora/conf/apps b/deployment/etc/pandora/conf/apps
index 340814c..9040efe 100644 (file)
--- a/deployment/etc/pandora/conf/apps
+++ b/deployment/etc/pandora/conf/apps
@@ -18,3 +18,8 @@ searchpath    ~/pxml-overrides
 [pnd]
 searchpath     /media/*/pandora/scripts:/usr/pandora/scripts
 runscript      pnd_run.sh
+
+# [pndnotifyd] sets some extra pndnotifyd specific items
+[pndnotifyd]
+# logging level 0 means to include debug; level 1 (regular), 2 (warnings), 3 (errors)
+#loglevel      0

diff --git a/include/pnd_conf.h b/include/pnd_conf.h
index 6cd18f5..9af6eee 100644 (file)
--- a/include/pnd_conf.h
+++ b/include/pnd_conf.h
@@ -120,6 +120,8 @@ pnd_conf_handle pnd_conf_fetch_by_path ( char *fullpath );
  * Returns NULL on error, otherwise a READ ONLY char* reference to the value.
  */
 char *pnd_conf_get_as_char ( pnd_conf_handle c, char *key );
+#define PND_CONF_BADNUM (-31337) /* really lame hack, I know */
+int pnd_conf_get_as_int ( pnd_conf_handle c, char *key );
 
 #ifdef __cplusplus
 } /* "C" */

diff --git a/include/pnd_logger.h b/include/pnd_logger.h
index dd9fe0d..d9fcc19 100644 (file)
--- a/include/pnd_logger.h
+++ b/include/pnd_logger.h
@@ -10,6 +10,7 @@ extern "C" {
 
 /* rudimentary logger; note that this is meant to be a no-brainer to use, so no setup is needed.
  */
+#define PND_LOG_FORCE (0xFF) /* use this log level to require it be emitted, no skipping */
 
 // defaults will have no filtering, so any message will be emitted to all targets
 // default target is nothing, however, so logger is silent unless activated
@@ -33,6 +34,7 @@ void pnd_log_set_pretext ( char * );                                        // e
 // set a 'filter level'; any log message of higher-or-equal level than current filter-level will be emitted. Thus, to remove filters
 // just set to level 0. Returns existing setting.
 unsigned char pnd_log_set_filter ( unsigned char newlevel );                // ex: app-specific enum/#defines for your levels
+unsigned char pnd_log_get_filter ( void );
 
 // how many targets can be opened, entirely? this is a compile time limit, for sanity.
 unsigned char pnd_log_max_targets ( void );

diff --git a/lib/pnd_conf.c b/lib/pnd_conf.c
index e3077c2..636625e 100644 (file)
--- a/lib/pnd_conf.c
+++ b/lib/pnd_conf.c
@@ -239,3 +239,15 @@ pnd_conf_handle pnd_conf_fetch_by_path ( char *fullpath ) {
 char *pnd_conf_get_as_char ( pnd_conf_handle c, char *key ) {
   return ( pnd_box_find_by_key ( c, key ) );
 }
+
+int pnd_conf_get_as_int ( pnd_conf_handle c, char *key ) {
+  char *t = pnd_box_find_by_key ( c, key );
+
+  if ( ! t ) {
+    return ( PND_CONF_BADNUM ); // non-existant
+  }
+
+  int i = atoi ( t );
+
+  return ( i );
+}

diff --git a/lib/pnd_logger.c b/lib/pnd_logger.c
index c3bcc43..ebfd230 100644 (file)
--- a/lib/pnd_logger.c
+++ b/lib/pnd_logger.c
@@ -43,6 +43,10 @@ unsigned char pnd_log_set_filter ( unsigned char newlevel ) {
   return ( foo );
 }
 
+unsigned char pnd_log_get_filter ( void ) {
+  return ( log_filterlevel );
+}
+
 void pnd_log_set_pretext ( char *pre ) {
 
   if ( log_pretext ) {
@@ -112,7 +116,10 @@ void pnd_log_emit ( char *message ) {
        fprintf ( log_targets [ i ].stream, "%s\t", log_pretext );
       }
       if ( message ) {
-       fprintf ( log_targets [ i ].stream, "%s\n", message );
+       fprintf ( log_targets [ i ].stream, "%s", message );
+       if ( strchr ( message, '\n' ) == NULL ) {
+         fprintf ( log_targets [ i ].stream, "\n" );
+       }
       }
       break;
 
@@ -133,7 +140,9 @@ void pnd_log_emit ( char *message ) {
 
 unsigned char pnd_log ( unsigned char level, char *fmt, ... ) {
 
-  if ( level < log_filterlevel ) {
+  if ( level == PND_LOG_FORCE ) {
+    // always proceed
+  } else if ( level < log_filterlevel ) {
     return ( 0 ); // too low level
   }
 

diff --git a/testdata/conf/apps b/testdata/conf/apps
index 46884ee..f7ab2c2 100644 (file)
--- a/testdata/conf/apps
+++ b/testdata/conf/apps
@@ -14,3 +14,8 @@ searchpath    ~/pxml-overrides:./testdata/apps-override
 [pnd]
 searchpath     /mnt/sd?/pandora/scripts:./testdata/scripts
 runscript      pnd_run.sh
+
+# [pndnotifyd] sets some extra pndnotifyd specific items
+[pndnotifyd]
+# logging level 0 means to include debug; level 1 (regular), 2 (warnings), 3 (errors)
+loglevel       0