/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc/vlc.h>
+#include <vlc_plugin.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_charset.h>
#include <errno.h> /* ENOMEM */
-#include <stdio.h>
#ifdef UNDER_CE
# define _IONBF 0x0004
#endif
-#include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include "charset.h"
-
#define MODE_TEXT 0
#define MODE_HTML 1
#define MODE_SYSLOG 2
#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" \
"<html>\n" \
" <head>\n" \
" <title>vlc log</title>\n" \
+ " <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" \
" </head>\n" \
- " <body bgcolor=\"#000000\" text=\"#aaaaaa\">\n" \
+ " <body style=\"background-color: #000000; color: #aaaaaa;\">\n" \
" <pre>\n" \
" <b>-- logger module started --</b>\n"
#define HTML_FOOTER \
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
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-static char *mode_list[] = { "text", "html"
+static const char *mode_list[] = { "text", "html"
#ifdef HAVE_SYSLOG_H
,"syslog"
#endif
};
-static char *mode_list_text[] = { N_("Text"), "HTML"
+static const char *mode_list_text[] = { N_("Text"), "HTML"
#ifdef HAVE_SYSLOG_H
, "syslog"
#endif
#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_shortname( _( "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 );
+ 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_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." ), 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_file )
{
#ifdef __APPLE__
- char *psz_homedir = p_this->p_vlc->psz_homedir;
+ char *psz_homedir = p_this->p_libvlc->psz_homedir;
- if( !psz_homedir )
+ if( !psz_homedir ) /* XXX: This should never happen */
{
- 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 = utf8_fopen( psz_file, "wt" );
+ p_intf->p_sys->p_file = utf8_fopen( psz_file, "at" );
if( p_intf->p_sys->p_file == NULL )
{
msg_Err( p_intf, "error opening logfile `%s'", psz_file );
{
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
}
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 );
+ p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
p_intf->pf_run = Run;
return 0;
/* 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 )
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 );
/*****************************************************************************
* 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;
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:
#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
static void HtmlPrint( const msg_item_t *p_msg, FILE *p_file )
{
- static const char *ppsz_color[4] = { "<font color=\"#ffffff\">",
- "<font color=\"#ff6666\">",
- "<font color=\"#ffff66\">",
- "<font color=\"#aaaaaa\">" };
+ static const char *ppsz_color[4] = { "<span style=\"color: #ffffff\">",
+ "<span style=\"color: #ff6666\">",
+ "<span style=\"color: #ffff66\">",
+ "<span style=\"color: #aaaaaa\">" };
LOG_STRING( p_msg->psz_module, p_file );
LOG_STRING( ppsz_type[p_msg->i_type], p_file );
LOG_STRING( ppsz_color[p_msg->i_type], p_file );
LOG_STRING( p_msg->psz_msg, p_file );
- LOG_STRING( "</font>\n", p_file );
+ LOG_STRING( "</span>\n", p_file );
}
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();
- 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 )
{
- fprintf( p_intf->p_sys->p_rrd, I64Fi":%f:%f:%f\n",
+ lldiv_t din = lldiv( p_intf->p_libvlc->p_stats->f_input_bitrate * 1000000,
+ 1000 );
+ lldiv_t ddm = lldiv( p_intf->p_libvlc->p_stats->f_demux_bitrate * 1000000,
+ 1000 );
+ lldiv_t dout = lldiv( p_intf->p_libvlc->p_stats->f_output_bitrate * 1000000,
+ 1000 );
+ fprintf( p_intf->p_sys->p_rrd,
+ "%"PRIi64":%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 );
}
}
projects / vlc / blobdiff