Add ability to log to syslog (Closes:#334)

configure.ac

@@ -677,6 +677,7 @@ AC_CHECK_HEADERS(arpa/inet.h net/if.h netinet/in.h sys/socket.h)
 if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
 AC_CHECK_HEADERS(machine/param.h sys/shm.h)
 AC_CHECK_HEADERS(linux/version.h)
+AC_CHECK_HEADERS(syslog.h)
 fi # end "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"
 
 AC_HEADER_TIME

modules/misc/logger.c

@@ -39,6 +39,7 @@
 
 #define MODE_TEXT 0
 #define MODE_HTML 1
+#define MODE_SYSLOG 2
 
 #ifdef SYS_DARWIN
 #define LOG_DIR "Library/Logs/"
@@ -66,6 +67,10 @@
     "  </body>\n" \
     "</html>\n"
 
+#if HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+
 /*****************************************************************************
  * intf_sys_t: description and status of log interface
  *****************************************************************************/
@@ -87,15 +92,30 @@ static void Run     ( intf_thread_t * );
 static void FlushQueue        ( msg_subscription_t *, FILE *, int );
 static void TextPrint         ( const msg_item_t *, FILE * );
 static void HtmlPrint         ( const msg_item_t *, FILE * );
+#ifdef HAVE_SYSLOG_H
+static void SyslogPrint       ( const msg_item_t *);
+#endif
 
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-static char *mode_list[] = { "text", "html" };
-static char *mode_list_text[] = { N_("Text"), "HTML" };
+static char *mode_list[] = { "text", "html"
+#ifdef HAVE_SYSLOG_H
+,"syslog"
+#endif
+};
+static char *mode_list_text[] = { N_("Text"), "HTML"
+#ifdef HAVE_SYSLOG_H
+, "syslog"
+#endif
+};
 
 #define LOGMODE_TEXT N_("Log format")
+#ifdef HAVE_SYSLOG_H
+#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are \"text\" (default), \"html\", and \"syslog\".")
+#else
 #define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are \"text\" (default) and \"html\".")
+#endif
 
 vlc_module_begin();
     set_category( CAT_INTERFACE );
@@ -121,7 +141,7 @@ static int Open( vlc_object_t *p_this )
     char *psz_mode, *psz_file;
 
     CONSOLE_INTRO_MSG;
-    msg_Info( p_intf, "Using the logger interface module..." );
+    msg_Info( p_intf, "Using logger..." );
 
     /* Allocate instance and initialize some members */
     p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
@@ -142,6 +162,12 @@ static int Open( vlc_object_t *p_this )
         {
             p_intf->p_sys->i_mode = MODE_HTML;
         }
+#ifdef HAVE_SYSLOG_H
+        else if( !strcmp( psz_mode, "syslog" ) )
+        {
+            p_intf->p_sys->i_mode = MODE_SYSLOG;
+        }
+#endif
         else
         {
             msg_Err( p_intf, "invalid log mode `%s', using `text'", psz_mode );
@@ -156,6 +182,8 @@ static int Open( vlc_object_t *p_this )
         p_intf->p_sys->i_mode = MODE_TEXT;
     }
 
+    if( p_intf->p_sys->i_mode != MODE_SYSLOG )
+    {
         psz_file = config_GetPsz( p_intf, "logfile" );
         if( !psz_file )
         {
@@ -196,7 +224,8 @@ static int Open( vlc_object_t *p_this )
                 break;
             }
 #endif
-        msg_Warn( p_intf, "no log filename provided, using `%s'", psz_file );
+            msg_Warn( p_intf, "no log filename provided, using `%s'",
+                               psz_file );
         }
 
         /* Open the log file and remove any buffering for the stream */
@@ -210,7 +239,6 @@ static int Open( vlc_object_t *p_this )
             return -1;
         }
         setvbuf( p_intf->p_sys->p_file, NULL, _IONBF, 0 );
-    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
 
         free( psz_file );
 
@@ -225,6 +253,16 @@ static int Open( vlc_object_t *p_this )
             break;
         }
 
+    }
+    else
+    {
+        p_intf->p_sys->p_file = NULL;
+#ifdef HAVE_SYSLOG_H
+        openlog( "VLC", 0, LOG_DAEMON );
+#endif
+    }
+
+    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
     p_intf->pf_run = Run;
 
     return 0;
@@ -248,12 +286,18 @@ static void Close( vlc_object_t *p_this )
         LOG_STRING( HTML_FOOTER, p_intf->p_sys->p_file );
         break;
     case MODE_TEXT:
+#ifdef HAVE_SYSLOG_H
+    case MODE_SYSLOG:
+        closelog();
+        break;
+#endif
     default:
         LOG_STRING( TEXT_FOOTER, p_intf->p_sys->p_file );
         break;
     }
 
     /* Close the log file */
+    if( p_intf->p_sys->i_mode != MODE_SYSLOG )
         fclose( p_intf->p_sys->p_file );
 
     /* Destroy structure */
@@ -278,7 +322,7 @@ static void Run( intf_thread_t *p_intf )
 }
 
 /*****************************************************************************
- * FlushQueue: flush the message queue into the log file
+ * FlushQueue: flush the message queue into the log
  *****************************************************************************/
 static void FlushQueue( msg_subscription_t *p_sub, FILE *p_file, int i_mode )
 {
@@ -300,6 +344,11 @@ static void FlushQueue( msg_subscription_t *p_sub, FILE *p_file, int i_mode )
             case MODE_HTML:
                 HtmlPrint( &p_sub->p_msg[i_start], p_file );
                 break;
+#ifdef HAVE_SYSLOG_H
+            case MODE_SYSLOG:
+                SyslogPrint( &p_sub->p_msg[i_start] );
+                break;
+#endif
             case MODE_TEXT:
             default:
                 TextPrint( &p_sub->p_msg[i_start], p_file );
@@ -324,6 +373,19 @@ static void TextPrint( const msg_item_t *p_msg, FILE *p_file )
     LOG_STRING( "\n", p_file );
 }
 
+#ifdef HAVE_SYSLOG_H
+static void SyslogPrint( const msg_item_t *p_msg )
+{
+    int i_priority;
+    if( p_msg->i_type  == 0 ) i_priority = LOG_INFO;
+    if( p_msg->i_type  == 1 ) i_priority = LOG_ERR;
+    if( p_msg->i_type  == 2 ) i_priority = LOG_WARNING;
+    if( p_msg->i_type  == 3 ) i_priority = LOG_DEBUG;
+
+    syslog( i_priority, "%s %s", p_msg->psz_module, p_msg->psz_msg );
+}
+#endif
+
 static void HtmlPrint( const msg_item_t *p_msg, FILE *p_file )
 {
     static const char *ppsz_color[4] = { "<font color=\"#ffffff\">",