X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmisc%2Flogger.c;h=e3902fd1126636a3a68914ad96d81bccd8f410b7;hb=c2752f8142a31b728b797ba915b59fc671744181;hp=88d49624b89f64015f220b89adee23cfa1458083;hpb=d96b3d9b4ad33e18070e582354bdbd436022ba0e;p=vlc

diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index 88d49624b8..e3902fd112 100644
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -120,13 +120,42 @@ static const char *const mode_list_text[] = { N_("Text"), "HTML"
 };
 
 #define LOGMODE_TEXT N_("Log format")
-#ifdef HAVE_SYSLOG_H
+#ifndef HAVE_SYSLOG_H
 #define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are " \
-  "\"text\" (default), \"html\", and \"syslog\" (special mode to send to " \
-  "syslog instead of file.")
+  "\"text\" (default) and \"html\".")
 #else
+
 #define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are " \
-  "\"text\" (default) and \"html\".")
+  "\"text\" (default), \"html\", and \"syslog\" (special mode to send to " \
+  "syslog instead of file.")
+
+#define SYSLOG_FACILITY_TEXT N_("Syslog facility")
+#define SYSLOG_FACILITY_LONGTEXT N_("Select the syslog facility where logs " \
+  "will be forwarded. Available choices are \"user\" (default), \"daemon\", " \
+  "and \"local0\" through \"local7\".")
+
+/* First in list is the default facility used. */
+#define DEFINE_SYSLOG_FACILITY \
+  DEF( "user",   LOG_USER ), \
+  DEF( "daemon", LOG_DAEMON ), \
+  DEF( "local0", LOG_LOCAL0 ), \
+  DEF( "local1", LOG_LOCAL1 ), \
+  DEF( "local2", LOG_LOCAL2 ), \
+  DEF( "local3", LOG_LOCAL3 ), \
+  DEF( "local4", LOG_LOCAL4 ), \
+  DEF( "local5", LOG_LOCAL5 ), \
+  DEF( "local6", LOG_LOCAL6 ), \
+  DEF( "local7", LOG_LOCAL7 )
+
+#define DEF( a, b ) a
+static const char *const fac_name[]   = { DEFINE_SYSLOG_FACILITY };
+#undef  DEF
+#define DEF( a, b ) b
+static const int         fac_number[] = { DEFINE_SYSLOG_FACILITY };
+#undef  DEF
+enum                   { fac_entries = sizeof(fac_name)/sizeof(fac_name[0]) };
+#undef  DEFINE_SYSLOG_FACILITY
+
 #endif
 
 vlc_module_begin ()
@@ -141,6 +170,11 @@ vlc_module_begin ()
     add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT,
                 false )
         change_string_list( mode_list, mode_list_text, 0 )
+#ifdef HAVE_SYSLOG_H
+    add_string( "syslog-facility", fac_name[0], NULL, SYSLOG_FACILITY_TEXT,
+                SYSLOG_FACILITY_LONGTEXT, true )
+        change_string_list( fac_name, fac_name, 0 )
+#endif
 
     add_obsolete_string( "rrd-file" )
 
@@ -158,7 +192,7 @@ static int Open( vlc_object_t *p_this )
     char *psz_mode;
 
     CONSOLE_INTRO_MSG;
-    msg_Info( p_intf, "using logger..." );
+    msg_Info( p_intf, "using logger." );
 
     /* Allocate instance and initialize some members */
     p_sys = p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
@@ -250,7 +284,36 @@ static int Open( vlc_object_t *p_this )
     {
         p_sys->msg.p_file = NULL;
 #ifdef HAVE_SYSLOG_H
-        openlog( "vlc", LOG_PID|LOG_NDELAY, LOG_DAEMON );
+        int i_facility;
+        char *psz_facility = var_CreateGetString( p_intf, "syslog-facility" );
+        if( psz_facility )
+        {
+            bool b_valid = 0;
+            for( size_t i = 0; i < fac_entries; ++i )
+            {
+                if( !strcmp( psz_facility, fac_name[i] ) )
+                {
+                    i_facility = fac_number[i];
+                    b_valid = 1;
+                    break;
+                }
+            }
+            if( !b_valid )
+            {
+                msg_Warn( p_intf, "invalid syslog facility `%s', using `%s'",
+                          psz_facility, fac_name[0] );
+                i_facility = fac_number[0];
+            }
+            free( psz_facility );
+        }
+        else
+        {
+            msg_Warn( p_intf, "no syslog facility specified, using `%s'",
+                      fac_name[0] );
+            i_facility = fac_number[0];
+        }
+
+        openlog( "vlc", LOG_PID|LOG_NDELAY, i_facility );
 #endif
     }