#include <vlc/vlc.h>
#include <vlc/intf.h>
+#include "charset.h"
#define MODE_TEXT 0
#define MODE_HTML 1
#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\".")
+#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
-#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are \"text\" (default) and \"html\".")
+#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are " \
+ "\"text\" (default) and \"html\".")
#endif
vlc_module_begin();
set_shortname( N_( "Logging" ) );
set_description( _("File logging") );
+ set_category( CAT_ADVANCED );
+ set_subcategory( SUBCAT_ADVANCED_MISC );
+
add_file( "logfile", NULL, NULL,
N_("Log filename"), N_("Specify the log filename."), VLC_FALSE );
add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT,
VLC_FALSE );
change_string_list( mode_list, mode_list_text, 0 );
- add_string( "rrd-file", NULL, NULL, N_("RRD output file") ,
- N_("Output data for RRDTool in this file" ), VLC_TRUE );
+ add_file( "rrd-file", NULL, NULL, N_("RRD output file") ,
+ N_("Output data for RRDTool in this file." ), VLC_TRUE );
set_capability( "interface", 0 );
set_callbacks( Open, Close );
char *psz_mode, *psz_file, *psz_rrd_file;
CONSOLE_INTRO_MSG;
- msg_Info( p_intf, "Using logger..." );
+ msg_Info( p_intf, "using logger..." );
/* Allocate instance and initialize some members */
p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
#endif
else
{
- msg_Err( p_intf, "invalid log mode `%s', using `text'", psz_mode );
+ msg_Warn( p_intf, "invalid log mode `%s', using `text'", psz_mode );
p_intf->p_sys->i_mode = MODE_TEXT;
}
if( !psz_homedir )
{
- msg_Err( p_this, "psz_homedir is null" );
+ msg_Err( p_this, "unable to find home directory" );
return -1;
}
psz_file = (char *)malloc( sizeof("/" LOG_DIR "/" LOG_FILE_HTML) +
/* Open the log file and remove any buffering for the stream */
msg_Dbg( p_intf, "opening logfile `%s'", psz_file );
- p_intf->p_sys->p_file = fopen( psz_file, "wt" );
+ p_intf->p_sys->p_file = utf8_fopen( psz_file, "wt" );
if( p_intf->p_sys->p_file == NULL )
{
msg_Err( p_intf, "error opening logfile `%s'", psz_file );
psz_rrd_file = config_GetPsz( p_intf, "rrd-file" );
if( psz_rrd_file && *psz_rrd_file )
{
- p_intf->p_sys->p_rrd = fopen( psz_rrd_file, "w" );
+ p_intf->p_sys->p_rrd = utf8_fopen( psz_rrd_file, "w" );
}
p_intf->p_sys->p_sub = msg_Subscribe( p_intf , MSG_QUEUE_NORMAL );
static void DoRRD( intf_thread_t *p_intf )
{
playlist_t *p_playlist;
- float f_input_bitrate;
if( mdate() - p_intf->p_sys->last_update < 1000000 )
return;
p_intf->p_sys->last_update = mdate();
FIND_ANYWHERE );
if( p_playlist && p_playlist->p_stats )
{
- fprintf( p_intf->p_sys->p_rrd, I64Fi":%f:%f:%f\n",
+ lldiv_t din = lldiv( p_playlist->p_stats->f_input_bitrate * 1000000,
+ 1000 );
+ lldiv_t ddm = lldiv( p_playlist->p_stats->f_demux_bitrate * 1000000,
+ 1000 );
+ lldiv_t dout = lldiv( p_playlist->p_stats->f_output_bitrate * 1000000,
+ 1000 );
+ fprintf( p_intf->p_sys->p_rrd,
+ I64Fi":%lld.%03u:%lld.%03u:%lld.%03u\n",
p_intf->p_sys->last_update/1000000,
- (float)(p_playlist->p_stats->f_input_bitrate)*1000,
- (float)(p_playlist->p_stats->f_demux_bitrate)*1000,
- (float)(p_playlist->p_stats->f_output_bitrate)*1000 );
+ 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 );
}