#include <vlc_plugin.h>
#include <vlc_interface.h>
#include <vlc_playlist.h>
-#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <assert.h>
-#ifdef UNDER_CE
-# define _IONBF 0x0004
-#endif
-
#define MODE_TEXT 0
#define MODE_HTML 1
#define MODE_SYSLOG 2
" </body>\n" \
"</html>\n"
-#if HAVE_SYSLOG_H
+#ifdef HAVE_SYSLOG_H
#include <syslog.h>
#endif
#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") )
SYSLOG_FACILITY_LONGTEXT, true )
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 )
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 )
{
/* 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 );
p_sys->msg.p_file = NULL;
#ifdef HAVE_SYSLOG_H
int i_facility;
- const char *const psz_facility =
- var_CreateGetString( p_intf, "syslog-facility" );
+ char *psz_facility = var_CreateGetString( p_intf, "syslog-facility" );
if( psz_facility )
{
bool b_valid = 0;
*/
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;
- }
- if (verbosity < priority)
+ if (verbosity < p_item->i_type)
return;
+ int canc = vlc_savecancel();
+
switch( p_sys->i_mode )
{
case MODE_HTML:
TextPrint( p_item, p_sys->p_file );
break;
}
+
+ vlc_restorecancel( canc );
}
static const char ppsz_type[4][11] = {