X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fmisc%2Flogger.c;h=e8347227c3d6ac559d8f1b92fc910acb68f36de6;hb=d09772f846f9250d7a1f04e58a48be8a76d8ece3;hp=a095e38729b606934f75d2d6cdba5f6465c76fbb;hpb=9f2fb762580b53abfde42d34187ccde8d3be48cc;p=vlc diff --git a/modules/misc/logger.c b/modules/misc/logger.c index a095e38729..e8347227c3 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. *****************************************************************************/ /***************************************************************************** @@ -32,15 +32,11 @@ #include #include #include -#include +#include #include #include -#ifdef UNDER_CE -# define _IONBF 0x0004 -#endif - #define MODE_TEXT 0 #define MODE_HTML 1 #define MODE_SYSLOG 2 @@ -72,7 +68,7 @@ " \n" \ "\n" -#if HAVE_SYSLOG_H +#ifdef HAVE_SYSLOG_H #include #endif @@ -120,25 +116,48 @@ static const char *const mode_list_text[] = { N_("Text"), "HTML" }; #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\" (special mode to send to " \ - "syslog instead of file.") -#else +#ifndef HAVE_SYSLOG_H #define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are " \ "\"text\" (default) and \"html\".") -#endif +#else -#ifdef HAVE_SYSLOG_H -static const char *const facility_list[] = { "daemon", "user", "local0", - "local1", "local2", "local3", "local4", "local5", "local6", "local7" }; +#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.") #define SYSLOG_FACILITY_TEXT N_("Syslog facility") #define SYSLOG_FACILITY_LONGTEXT N_("Select the syslog facility where logs " \ - "will be forwarded. Available choices are \"daemon\" (default), \"user\", " \ + "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 +#define LOGVERBOSE_TEXT N_("Verbosity") +#define LOGVERBOSE_LONGTEXT N_("Select the verbosity to use for log or -1 to " \ +"use the same verbosity given by --verbose.") + vlc_module_begin () set_shortname( N_( "Logging" ) ) set_description( N_("File logging") ) @@ -152,11 +171,13 @@ vlc_module_begin () false ) change_string_list( mode_list, mode_list_text, 0 ) #ifdef HAVE_SYSLOG_H - add_string( "syslog-facility", "daemon", NULL, SYSLOG_FACILITY_TEXT, + add_string( "syslog-facility", fac_name[0], NULL, SYSLOG_FACILITY_TEXT, SYSLOG_FACILITY_LONGTEXT, true ) - change_string_list( facility_list, facility_list, 0 ) + change_string_list( fac_name, fac_name, 0 ) #endif - + add_integer( "log-verbose", -1, NULL, LOGVERBOSE_TEXT, LOGVERBOSE_LONGTEXT, + false ) + add_obsolete_string( "rrd-file" ) set_capability( "interface", 0 ) @@ -173,7 +194,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 ) ); @@ -211,14 +232,17 @@ static int Open( vlc_object_t *p_this ) if( p_sys->msg.i_mode != MODE_SYSLOG ) { - char *psz_file = config_GetPsz( p_intf, "logfile" ); + char *psz_file = var_InheritString( p_intf, "logfile" ); if( !psz_file ) { #ifdef __APPLE__ - if( asprintf( &psz_file, "%s/"LOG_DIR"/%s", config_GetHomeDir(), + char *home = config_GetUserDir(VLC_DOCUMENTS_DIR); + if( home == NULL + || asprintf( &psz_file, "%s/"LOG_DIR"/%s", home, (p_sys->msg.i_mode == MODE_HTML) ? LOG_FILE_HTML : LOG_FILE_TEXT ) == -1 ) psz_file = NULL; + free(home); #else switch( p_sys->msg.i_mode ) { @@ -237,7 +261,7 @@ static int Open( vlc_object_t *p_this ) /* Open the log file and remove any buffering for the stream */ msg_Dbg( p_intf, "opening logfile `%s'", psz_file ); - p_sys->msg.p_file = utf8_fopen( psz_file, "at" ); + p_sys->msg.p_file = vlc_fopen( psz_file, "at" ); if( p_sys->msg.p_file == NULL ) { msg_Err( p_intf, "error opening logfile `%s'", psz_file ); @@ -265,39 +289,33 @@ static int Open( vlc_object_t *p_this ) { p_sys->msg.p_file = NULL; #ifdef HAVE_SYSLOG_H - int i_facility = LOG_DAEMON; + int i_facility; char *psz_facility = var_CreateGetString( p_intf, "syslog-facility" ); if( psz_facility ) { bool b_valid = 0; - static const struct { const char psz_name[7]; int i_value; } - p_facility[10] = { - { "daemon", LOG_DAEMON }, { "user", LOG_USER }, - { "local0", LOG_LOCAL0 }, { "local1", LOG_LOCAL1 }, - { "local2", LOG_LOCAL2 }, { "local3", LOG_LOCAL3 }, - { "local4", LOG_LOCAL4 }, { "local5", LOG_LOCAL5 }, - { "local6", LOG_LOCAL6 }, { "local7", LOG_LOCAL7 } - }; - for( size_t i = 0; - i < sizeof( p_facility ) / sizeof( p_facility[0] ); - i++ ) + for( size_t i = 0; i < fac_entries; ++i ) { - if( !strcmp( psz_facility, p_facility[i].psz_name ) ) + if( !strcmp( psz_facility, fac_name[i] ) ) { - i_facility = p_facility[i].i_value; + i_facility = fac_number[i]; b_valid = 1; break; } } if( !b_valid ) { - msg_Warn( p_intf, "invalid syslog facility `%s', using `daemon'", psz_facility ); + 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 `daemon'" ); + 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 ); @@ -350,16 +368,27 @@ static void Close( vlc_object_t *p_this ) */ static void Overflow (msg_cb_data_t *p_sys, msg_item_t *p_item, unsigned overruns) { - int verbosity = var_CreateGetInteger( p_sys->p_intf, "verbose" ); - int priority = 0; + VLC_UNUSED(overruns); + int verbosity = var_CreateGetInteger( p_sys->p_intf, "log-verbose" ); + if (verbosity == -1) + verbosity = var_CreateGetInteger( p_sys->p_intf, "verbose" ); switch( p_item->i_type ) { - case VLC_MSG_WARN: priority = 1; break; - case VLC_MSG_DBG: priority = 2; break; + case VLC_MSG_INFO: + case VLC_MSG_ERR: + if( verbosity < 0 ) return; + break; + case VLC_MSG_WARN: + if( verbosity < 1 ) return; + break; + case VLC_MSG_DBG: + if( verbosity < 2 ) return; + break; } - if (verbosity < priority) - return; + + + int canc = vlc_savecancel(); switch( p_sys->i_mode ) { @@ -376,6 +405,8 @@ static void Overflow (msg_cb_data_t *p_sys, msg_item_t *p_item, unsigned overrun TextPrint( p_item, p_sys->p_file ); break; } + + vlc_restorecancel( canc ); } static const char ppsz_type[4][11] = { @@ -387,8 +418,8 @@ static const char ppsz_type[4][11] = { static void TextPrint( const msg_item_t *p_msg, FILE *p_file ) { - fprintf( p_file, "%s%s%s\n", p_msg->psz_module, ppsz_type[p_msg->i_type], - p_msg->psz_msg ); + utf8_fprintf( p_file, "%s%s%s\n", p_msg->psz_module, + ppsz_type[p_msg->i_type], p_msg->psz_msg ); } #ifdef HAVE_SYSLOG_H