Add -l option for syslog support

Use -l to log to the syslog daemon instead of the stderror. This is very
usefull when running unattended.

git-svn-id: svn://svn.videolan.org/dvblast/trunk@134 55d3f8b6-4a41-4d2d-a900-313d1436a5b8

dvblast.c

@@ -67,6 +67,7 @@ int b_enable_epg = 0;
 int b_unique_tsid = 0;
 volatile int b_hup_received = 0;
 int i_verbose = DEFAULT_VERBOSITY;
+int i_syslog = 0;
 uint16_t i_src_port = DEFAULT_PORT;
 in_addr_t i_src_addr = { 0 };
 int b_src_rawudp = 0;
@@ -351,6 +352,7 @@ void usage()
     msg_Raw( NULL, "  -h --help             display this full help" );
     msg_Raw( NULL, "  -i --priority <RT pritority>" );
     msg_Raw( NULL, "  -q                    be quiet (less verbosity, repeat or use number for even quieter)" );
+    msg_Raw( NULL, "  -l --logger           use syslog for logging messages instead of stderr" );
     msg_Raw( NULL, "  -r --remote-socket <remote socket>" );
     msg_Raw( NULL, "  -V --version          only display the version" );
     exit(1);
@@ -362,6 +364,8 @@ int main( int i_argc, char **pp_argv )
     int i_error;
     int c;
 
+    int b_enable_syslog = 0;
+
     DisplayVersion();
 
     if ( i_argc == 1 )
@@ -393,12 +397,13 @@ int main( int i_argc, char **pp_argv )
         { "rtp-input",       required_argument, NULL, 'D' },
         { "asi-adapter",     required_argument, NULL, 'A' },
         { "epg-passthrough", no_argument,       NULL, 'e' },
+        { "logger",          no_argument,       NULL, 'l' },
         { "help",            no_argument,       NULL, 'h' },
         { "version",         no_argument,       NULL, 'V' },
         { 0, 0, 0, 0}
     }; 
 
-    while ( ( c = getopt_long(i_argc, pp_argv, "q::c:r:t:o:i:a:n:f:F:R:s:S:v:pb:m:uWUTd:D:A:ehV", long_options, NULL)) != -1 )
+    while ( ( c = getopt_long(i_argc, pp_argv, "q::c:r:t:o:i:a:n:f:F:R:s:S:v:pb:m:uWUTd:D:A:lehV", long_options, NULL)) != -1 )
     {
         switch ( c )
         {
@@ -660,6 +665,10 @@ int main( int i_argc, char **pp_argv )
             b_enable_epg = 1;
             break;
 
+        case 'l':
+            b_enable_syslog = 1;
+            break;
+
         case 'T':
             b_unique_tsid = 1;
             break;
@@ -676,6 +685,9 @@ int main( int i_argc, char **pp_argv )
     if ( optind < i_argc || pf_Open == NULL )
         usage();
 
+    if ( b_enable_syslog )
+        msg_Connect( pp_argv[0] );
+
     msg_Warn( NULL, "restarting" );
 
     if ( b_output_udp )
@@ -717,4 +729,7 @@ int main( int i_argc, char **pp_argv )
 
         demux_Run();
     }
+
+    if ( b_enable_syslog )
+        msg_Disconnect();
 }

dvblast.h

@@ -100,6 +100,7 @@ typedef struct output_t
     uint8_t i_config;
 } output_t;
 
+extern int i_syslog;
 extern int i_verbose;
 extern output_t **pp_outputs;
 extern int i_nb_outputs;
@@ -139,11 +140,19 @@ extern void (*pf_UnsetFilter)( int i_fd, uint16_t i_pid );
 /*****************************************************************************
  * Prototypes
  *****************************************************************************/
+
+/* Connect/Disconnect from syslogd */
+void msg_Connect( const char *ident );
+void msg_Disconnect( void );
+
+/* */
 void msg_Info( void *_unused, const char *psz_format, ... );
 void msg_Err( void *_unused, const char *psz_format, ... );
 void msg_Warn( void *_unused, const char *psz_format, ... );
 void msg_Dbg( void *_unused, const char *psz_format, ... );
 void msg_Raw( void *_unused, const char *psz_format, ... );
+
+/* */
 mtime_t mdate( void );
 void msleep( mtime_t delay );
 void hexDump( uint8_t *p_data, uint32_t i_len );

dvblastctl.c

@@ -41,6 +41,7 @@
 #include "version.h"
 
 int i_verbose = 3;
+int i_syslog = 0;
 
 void usage()
 {

util.c

@@ -32,6 +32,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
+#include <syslog.h>
 
 #include "dvblast.h"
 
@@ -45,6 +46,24 @@
 #define VERB_INFO 2
 #define VERB_WARN 1
 
+/*****************************************************************************
+ * msg_Connect
+ *****************************************************************************/
+void msg_Connect( const char *ident )
+{
+    i_syslog = 1;
+    openlog( ident, LOG_NDELAY | LOG_PID, LOG_USER );
+}
+
+/*****************************************************************************
+ * msg_Disconnect
+ *****************************************************************************/
+void msg_Disconnect( void )
+{
+    i_syslog = 0;
+    closelog();
+}
+
 /*****************************************************************************
  * msg_Info
  *****************************************************************************/
@@ -57,6 +76,9 @@ void msg_Info( void *_unused, const char *psz_format, ... )
         va_start( args, psz_format );
 
         snprintf( psz_fmt, MAX_MSG, "info: %s\n", psz_format );
+        if ( i_syslog )
+            vsyslog( LOG_INFO, psz_fmt, args );
+        else
             vfprintf( stderr, psz_fmt, args );
     }
 }
@@ -71,6 +93,9 @@ void msg_Err( void *_unused, const char *psz_format, ... )
     va_start( args, psz_format );
 
     snprintf( psz_fmt, MAX_MSG, "error: %s\n", psz_format );
+    if ( i_syslog )
+        vsyslog( LOG_ERR, psz_fmt, args );
+    else
         vfprintf( stderr, psz_fmt, args );
 }
 
@@ -86,6 +111,9 @@ void msg_Warn( void *_unused, const char *psz_format, ... )
         va_start( args, psz_format );
 
         snprintf( psz_fmt, MAX_MSG, "warning: %s\n", psz_format );
+        if ( i_syslog )
+            vsyslog( LOG_WARNING, psz_fmt, args );
+        else
             vfprintf( stderr, psz_fmt, args );
     }
 }
@@ -102,6 +130,9 @@ void msg_Dbg( void *_unused, const char *psz_format, ... )
         va_start( args, psz_format );
 
         snprintf( psz_fmt, MAX_MSG, "debug: %s\n", psz_format );
+        if ( i_syslog )
+            vsyslog( LOG_DEBUG, psz_fmt, args );
+        else
             vfprintf( stderr, psz_fmt, args );
     }
 }
@@ -116,6 +147,9 @@ void msg_Raw( void *_unused, const char *psz_format, ... )
     va_start( args, psz_format );
 
     snprintf( psz_fmt, MAX_MSG, "%s\n", psz_format );
+    if ( i_syslog )
+        vsyslog( LOG_NOTICE, psz_fmt, args );
+    else
         vfprintf( stderr, psz_fmt, args );
 }