]> git.sesse.net Git - vlc/blobdiff - modules/misc/logger.c
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Use the verbose variable, over the private i_verbose member
[vlc] / modules / misc / logger.c
diff --git a/modules/misc/logger.c b/modules/misc/logger.c
index b514703b881dd6e32e813e520aaa95163dfb0291..e4554d9607bbdf76f347e2dd01ee867093aca218 100644 (file)
--- a/modules/misc/logger.c
+++ b/modules/misc/logger.c
@@ -25,6 +25,10 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
@@ -53,8 +57,8 @@
 #define TEXT_FOOTER "-- logger module stopped --\n"
 
 #define HTML_HEADER \
-    "<!DOCTYPE html PUBLIC \"-\/\/W3C\/\/DTD HTML 4.01\/\/EN\"\n" \
-    "  \"http:\/\/www.w3.org/TR/html4/strict.dtd\">\n" \
+    "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n" \
+    "  \"http://www.w3.org/TR/html4/strict.dtd\">\n" \
     "<html>\n" \
     "  <head>\n" \
     "    <title>vlc log</title>\n" \
@@ -93,7 +97,7 @@ static int  Open    ( vlc_object_t * );
 static void Close   ( vlc_object_t * );
 static void Run     ( intf_thread_t * );
 
-static void FlushQueue        ( msg_subscription_t *, FILE *, int );
+static void FlushQueue        ( msg_subscription_t *, FILE *, int, int );
 static void TextPrint         ( const msg_item_t *, FILE * );
 static void HtmlPrint         ( const msg_item_t *, FILE * );
 #ifdef HAVE_SYSLOG_H
@@ -134,13 +138,14 @@ vlc_module_begin();
     set_subcategory( SUBCAT_ADVANCED_MISC );
 
     add_file( "logfile", NULL, NULL,
-             N_("Log filename"), N_("Specify the log filename."), VLC_FALSE );
+             N_("Log filename"), N_("Specify the log filename."), false );
+        change_unsafe();
     add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT,
-                VLC_FALSE );
+                false );
         change_string_list( mode_list, mode_list_text, 0 );
 
     add_file( "rrd-file", NULL, NULL, N_("RRD output file") ,
-                    N_("Output data for RRDTool in this file." ), VLC_TRUE );
+                    N_("Output data for RRDTool in this file." ), true );
 
     set_capability( "interface", 0 );
     set_callbacks( Open, Close );
@@ -272,7 +277,7 @@ static int Open( vlc_object_t *p_this )
     {
         p_intf->p_sys->p_file = NULL;
 #ifdef HAVE_SYSLOG_H
-        openlog( "VLC", 0, LOG_DAEMON );
+        openlog( "vlc", LOG_PID|LOG_NDELAY, LOG_DAEMON );
 #endif
     }
 
@@ -300,7 +305,8 @@ static void Close( vlc_object_t *p_this )
 
     /* Flush the queue and unsubscribe from the message queue */
     FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
-                p_intf->p_sys->i_mode );
+                p_intf->p_sys->i_mode,
+                var_CreateGetInteger( p_intf, "verbose" ) );
     msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
 
     switch( p_intf->p_sys->i_mode )
@@ -338,8 +344,8 @@ static void Run( intf_thread_t *p_intf )
     while( !p_intf->b_die )
     {
         FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
-                    p_intf->p_sys->i_mode );
-
+                    p_intf->p_sys->i_mode,
+                    var_CreateGetInteger( p_intf, "verbose" ) );
         if( p_intf->p_sys->p_rrd )
             DoRRD( p_intf );
 
@@ -350,7 +356,8 @@ static void Run( intf_thread_t *p_intf )
 /*****************************************************************************
  * FlushQueue: flush the message queue into the log
  *****************************************************************************/
-static void FlushQueue( msg_subscription_t *p_sub, FILE *p_file, int i_mode )
+static void FlushQueue( msg_subscription_t *p_sub, FILE *p_file, int i_mode,
+                        int i_verbose )
 {
     int i_start, i_stop;
 
@@ -365,6 +372,22 @@ static void FlushQueue( msg_subscription_t *p_sub, FILE *p_file, int i_mode )
              i_start != i_stop;
              i_start = (i_start+1) % VLC_MSG_QSIZE )
         {
+            switch( p_sub->p_msg[i_start].i_type )
+            {
+            case VLC_MSG_ERR:
+                if( i_verbose < 0 ) continue;
+                break;
+            case VLC_MSG_INFO:
+                if( i_verbose < 0 ) continue;
+                break;
+            case VLC_MSG_WARN:
+                if( i_verbose < 1 ) continue;
+                break;
+            case VLC_MSG_DBG:
+                if( i_verbose < 2 ) continue;
+                break;
+            }
+
             switch( i_mode )
             {
             case MODE_HTML:
@@ -402,18 +425,16 @@ static void TextPrint( const msg_item_t *p_msg, FILE *p_file )
 #ifdef HAVE_SYSLOG_H
 static void SyslogPrint( const msg_item_t *p_msg )
 {
-    int i_priority = LOG_INFO;
-
-    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;
+    static const int i_prio[4] = { LOG_INFO, LOG_ERR, LOG_WARNING, LOG_DEBUG };
+    int i_priority = i_prio[p_msg->i_type];
 
     if( p_msg->psz_header )
-        syslog( i_priority, "%s %s: %s", p_msg->psz_header,
+        syslog( i_priority, "%s%s %s: %s", p_msg->psz_header,
+                ppsz_type[p_msg->i_type],
                 p_msg->psz_module, p_msg->psz_msg );
     else
-        syslog( i_priority, "%s: %s", p_msg->psz_module, p_msg->psz_msg );
+        syslog( i_priority, "%s%s: %s", p_msg->psz_module, 
+                ppsz_type[p_msg->i_type], p_msg->psz_msg );
  
 }
 #endif
@@ -434,28 +455,24 @@ static void HtmlPrint( const msg_item_t *p_msg, FILE *p_file )
 
 static void DoRRD( intf_thread_t *p_intf )
 {
-    playlist_t *p_playlist;
     if( mdate() - p_intf->p_sys->last_update < 1000000 )
         return;
     p_intf->p_sys->last_update = mdate();
 
-    p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
-                                                FIND_ANYWHERE );
-    if( p_playlist && p_playlist->p_stats )
+    if( p_intf->p_libvlc->p_stats )
     {
-        lldiv_t din = lldiv( p_playlist->p_stats->f_input_bitrate * 1000000,
+        lldiv_t din = lldiv( p_intf->p_libvlc->p_stats->f_input_bitrate * 1000000,
                              1000 );
-        lldiv_t ddm = lldiv( p_playlist->p_stats->f_demux_bitrate * 1000000,
+        lldiv_t ddm = lldiv( p_intf->p_libvlc->p_stats->f_demux_bitrate * 1000000,
                              1000 );
-        lldiv_t dout = lldiv( p_playlist->p_stats->f_output_bitrate * 1000000,
+        lldiv_t dout = lldiv( p_intf->p_libvlc->p_stats->f_output_bitrate * 1000000,
                              1000 );
         fprintf( p_intf->p_sys->p_rrd,
-                   I64Fi":%lld.%03u:%lld.%03u:%lld.%03u\n",
+                   "%"PRIi64":%lld.%03u:%lld.%03u:%lld.%03u\n",
                    p_intf->p_sys->last_update/1000000,
                    din.quot, (unsigned int)din.rem,
                    ddm.quot, (unsigned int)ddm.rem,
                    dout.quot, (unsigned int)dout.rem );
         fflush( p_intf->p_sys->p_rrd );
-        vlc_object_release( p_playlist );
     }
 }
Unnamed repository; edit this file 'description' to name the repository.