2002-08-04 19:23:44 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* logger.c : file logging plugin for vlc
|
|
|
|
|
*****************************************************************************
|
2005-07-09 08:17:09 +02:00
|
|
|
* Copyright (C) 2002 the VideoLAN team
|
2004-03-06 16:24:37 +01:00
|
|
|
* $Id$
|
2002-08-04 19:23:44 +02:00
|
|
|
*
|
|
|
|
|
* Authors: Samuel Hocevar <sam@zoy.org>
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
2005-01-29 16:22:53 +01:00
|
|
|
*
|
2002-08-04 19:23:44 +02:00
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* 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
|
2006-01-13 00:10:04 +01:00
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
|
2002-08-04 19:23:44 +02:00
|
|
|
*****************************************************************************/
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* Preamble
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
|
2008-01-23 22:50:58 +01:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
# include "config.h"
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-09-05 15:51:21 +02:00
|
|
|
#include <vlc/vlc.h>
|
2008-05-08 17:30:33 +02:00
|
|
|
#include <vlc_plugin.h>
|
2007-09-05 15:51:21 +02:00
|
|
|
#include <vlc_interface.h>
|
|
|
|
|
#include <vlc_playlist.h>
|
|
|
|
|
#include <vlc_charset.h>
|
|
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
#include <errno.h> /* ENOMEM */
|
|
|
|
|
|
2004-10-08 12:36:25 +02:00
|
|
|
#ifdef UNDER_CE
|
|
|
|
|
# define _IONBF 0x0004
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
#define MODE_TEXT 0
|
|
|
|
|
#define MODE_HTML 1
|
2005-11-30 00:12:52 +01:00
|
|
|
#define MODE_SYSLOG 2
|
2002-08-04 19:23:44 +02:00
|
|
|
|
2006-02-01 14:01:06 +01:00
|
|
|
#ifdef __APPLE__
|
2004-03-27 18:36:46 +01:00
|
|
|
#define LOG_DIR "Library/Logs/"
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#define LOG_FILE_TEXT "vlc-log.txt"
|
|
|
|
|
#define LOG_FILE_HTML "vlc-log.html"
|
|
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
#define LOG_STRING( msg, file ) fwrite( msg, strlen( msg ), 1, file );
|
|
|
|
|
|
|
|
|
|
#define TEXT_HEADER "-- logger module started --\n"
|
|
|
|
|
#define TEXT_FOOTER "-- logger module stopped --\n"
|
|
|
|
|
|
|
|
|
|
#define HTML_HEADER \
|
2007-09-13 18:26:28 +02:00
|
|
|
"<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n" \
|
|
|
|
|
" \"http://www.w3.org/TR/html4/strict.dtd\">\n" \
|
2002-08-04 19:23:44 +02:00
|
|
|
"<html>\n" \
|
|
|
|
|
" <head>\n" \
|
|
|
|
|
" <title>vlc log</title>\n" \
|
2007-09-13 18:24:27 +02:00
|
|
|
" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" \
|
2002-08-04 19:23:44 +02:00
|
|
|
" </head>\n" \
|
2007-09-13 18:24:27 +02:00
|
|
|
" <body style=\"background-color: #000000; color: #aaaaaa;\">\n" \
|
2002-08-04 19:23:44 +02:00
|
|
|
" <pre>\n" \
|
|
|
|
|
" <b>-- logger module started --</b>\n"
|
|
|
|
|
#define HTML_FOOTER \
|
|
|
|
|
" <b>-- logger module stopped --</b>\n" \
|
|
|
|
|
" </pre>\n" \
|
|
|
|
|
" </body>\n" \
|
|
|
|
|
"</html>\n"
|
|
|
|
|
|
2005-11-30 00:12:52 +01:00
|
|
|
#if HAVE_SYSLOG_H
|
|
|
|
|
#include <syslog.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* intf_sys_t: description and status of log interface
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
struct intf_sys_t
|
|
|
|
|
{
|
|
|
|
|
int i_mode;
|
2006-01-28 11:56:47 +01:00
|
|
|
FILE *p_rrd;
|
|
|
|
|
mtime_t last_update;
|
2008-05-20 15:23:35 +02:00
|
|
|
time_t now; /* timestamp for rrd-log */
|
2002-08-04 19:23:44 +02:00
|
|
|
|
|
|
|
|
FILE * p_file; /* The log file */
|
|
|
|
|
msg_subscription_t *p_sub;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* Local prototypes
|
|
|
|
|
*****************************************************************************/
|
2005-01-29 16:22:53 +01:00
|
|
|
static int Open ( vlc_object_t * );
|
2002-08-04 19:23:44 +02:00
|
|
|
static void Close ( vlc_object_t * );
|
|
|
|
|
static void Run ( intf_thread_t * );
|
|
|
|
|
|
2008-03-12 23:13:11 +01:00
|
|
|
static void FlushQueue ( msg_subscription_t *, FILE *, int, int );
|
2002-08-04 19:23:44 +02:00
|
|
|
static void TextPrint ( const msg_item_t *, FILE * );
|
|
|
|
|
static void HtmlPrint ( const msg_item_t *, FILE * );
|
2005-11-30 00:12:52 +01:00
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
|
|
|
static void SyslogPrint ( const msg_item_t *);
|
|
|
|
|
#endif
|
2002-08-04 19:23:44 +02:00
|
|
|
|
2006-01-28 11:56:47 +01:00
|
|
|
static void DoRRD( intf_thread_t *p_intf );
|
|
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
/*****************************************************************************
|
|
|
|
|
* Module descriptor
|
|
|
|
|
*****************************************************************************/
|
2006-12-24 15:18:21 +01:00
|
|
|
static const char *mode_list[] = { "text", "html"
|
2005-11-30 00:12:52 +01:00
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
|
|
|
,"syslog"
|
|
|
|
|
#endif
|
|
|
|
|
};
|
2006-12-24 15:18:21 +01:00
|
|
|
static const char *mode_list_text[] = { N_("Text"), "HTML"
|
2005-11-30 00:12:52 +01:00
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
|
|
|
, "syslog"
|
|
|
|
|
#endif
|
|
|
|
|
};
|
2003-11-05 01:39:17 +01:00
|
|
|
|
2003-05-16 00:27:38 +02:00
|
|
|
#define LOGMODE_TEXT N_("Log format")
|
2005-11-30 00:12:52 +01:00
|
|
|
#ifdef HAVE_SYSLOG_H
|
2006-03-22 13:14:30 +01:00
|
|
|
#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.")
|
2005-11-30 00:12:52 +01:00
|
|
|
#else
|
2006-03-22 13:14:30 +01:00
|
|
|
#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are " \
|
2006-03-22 15:14:10 +01:00
|
|
|
"\"text\" (default) and \"html\".")
|
2005-11-30 00:12:52 +01:00
|
|
|
#endif
|
2003-05-16 00:27:38 +02:00
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
vlc_module_begin();
|
2008-05-21 19:19:25 +02:00
|
|
|
set_shortname( N_( "Logging" ) );
|
|
|
|
|
set_description( N_("File logging") );
|
2004-01-25 18:52:17 +01:00
|
|
|
|
2006-03-09 20:55:40 +01:00
|
|
|
set_category( CAT_ADVANCED );
|
|
|
|
|
set_subcategory( SUBCAT_ADVANCED_MISC );
|
|
|
|
|
|
2006-01-22 18:12:24 +01:00
|
|
|
add_file( "logfile", NULL, NULL,
|
2008-04-14 00:08:29 +02:00
|
|
|
N_("Log filename"), N_("Specify the log filename."), false );
|
vlc security: As i've seen very little improvement on that front, i've decided to check in my take on handling the problem of managing harmful options. I'm pretty sure this is going to be very controversial, but I think my approach is quite simple and yet very effective Anyway, my approach makes the following assumptions:
- most vlc options are considered safe, only a handful are particularily unsafe and need be declared as such in their definition (they mostly deal with writing to an output file or URL)
- unsafe options are only considered potentially harmful when used as an input option, ie. the ':option' format. Configuration options are always considered safe 'i.e --option'
- unsafe options are associated with a global security policy, which dictates how these are handled. At the moment, The policy can be either block, allow or prompt, and is set using the '--security-policy' option (which itself is considered unsafe ;)
the policy can be set by the user at the command line or in the preferences, it curently defaults to prompt, which is the desirable state for deskop use. However, it can be overriden depending on context, for example, the activex and mozilla will force the security-policy to block regardless of preference settins.
the code is a bit rough at the moment, but i will optimize/clean it up if the dev community this approach is worth keeping.
try the following example, and you'll see quickly what i mean:
./vlc -vvv <a mrl> :sout=#transcode{vcodec=mp1v,vb=1024,acodec=mpga,ab=192}:standard{mux=ts,dst=vlc-output.ts,access=file}"
Enjoy,
Damien
2008-01-16 20:30:12 +01:00
|
|
|
change_unsafe();
|
2003-11-05 01:39:17 +01:00
|
|
|
add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT,
|
2008-04-14 00:08:29 +02:00
|
|
|
false );
|
2003-11-05 01:39:17 +01:00
|
|
|
change_string_list( mode_list, mode_list_text, 0 );
|
2004-01-25 18:52:17 +01:00
|
|
|
|
2006-03-26 00:10:43 +01:00
|
|
|
add_file( "rrd-file", NULL, NULL, N_("RRD output file") ,
|
2008-04-14 00:08:29 +02:00
|
|
|
N_("Output data for RRDTool in this file." ), true );
|
2006-01-28 11:56:47 +01:00
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
set_capability( "interface", 0 );
|
|
|
|
|
set_callbacks( Open, Close );
|
|
|
|
|
vlc_module_end();
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* Open: initialize and create stuff
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
static int Open( vlc_object_t *p_this )
|
2005-11-30 00:12:52 +01:00
|
|
|
{
|
2002-08-04 19:23:44 +02:00
|
|
|
intf_thread_t *p_intf = (intf_thread_t *)p_this;
|
2006-01-28 11:56:47 +01:00
|
|
|
char *psz_mode, *psz_file, *psz_rrd_file;
|
2002-08-04 19:23:44 +02:00
|
|
|
|
2002-10-03 19:01:59 +02:00
|
|
|
CONSOLE_INTRO_MSG;
|
2006-03-26 00:10:43 +01:00
|
|
|
msg_Info( p_intf, "using logger..." );
|
2002-08-04 19:23:44 +02:00
|
|
|
|
|
|
|
|
/* Allocate instance and initialize some members */
|
|
|
|
|
p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
|
|
|
|
|
if( p_intf->p_sys == NULL )
|
|
|
|
|
{
|
|
|
|
|
msg_Err( p_intf, "out of memory" );
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-22 18:12:24 +01:00
|
|
|
psz_mode = var_CreateGetString( p_intf, "logmode" );
|
2002-08-04 19:23:44 +02:00
|
|
|
if( psz_mode )
|
|
|
|
|
{
|
|
|
|
|
if( !strcmp( psz_mode, "text" ) )
|
|
|
|
|
{
|
|
|
|
|
p_intf->p_sys->i_mode = MODE_TEXT;
|
|
|
|
|
}
|
|
|
|
|
else if( !strcmp( psz_mode, "html" ) )
|
|
|
|
|
{
|
|
|
|
|
p_intf->p_sys->i_mode = MODE_HTML;
|
|
|
|
|
}
|
2005-11-30 00:12:52 +01:00
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
|
|
|
else if( !strcmp( psz_mode, "syslog" ) )
|
|
|
|
|
{
|
|
|
|
|
p_intf->p_sys->i_mode = MODE_SYSLOG;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2002-08-04 19:23:44 +02:00
|
|
|
else
|
|
|
|
|
{
|
2006-03-22 13:14:30 +01:00
|
|
|
msg_Warn( p_intf, "invalid log mode `%s', using `text'", psz_mode );
|
2002-08-04 19:23:44 +02:00
|
|
|
p_intf->p_sys->i_mode = MODE_TEXT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free( psz_mode );
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
msg_Warn( p_intf, "no log mode specified, using `text'" );
|
|
|
|
|
p_intf->p_sys->i_mode = MODE_TEXT;
|
|
|
|
|
}
|
|
|
|
|
|
2005-11-30 00:12:52 +01:00
|
|
|
if( p_intf->p_sys->i_mode != MODE_SYSLOG )
|
2002-08-04 19:23:44 +02:00
|
|
|
{
|
2005-11-30 00:12:52 +01:00
|
|
|
psz_file = config_GetPsz( p_intf, "logfile" );
|
|
|
|
|
if( !psz_file )
|
|
|
|
|
{
|
2006-02-01 14:01:06 +01:00
|
|
|
#ifdef __APPLE__
|
2008-05-22 20:28:54 +02:00
|
|
|
if( asprintf( &psz_file, "%s/"LOG_DIR"/%s", config_GetHomeDir(),
|
|
|
|
|
(p_intf->p_sys->i_mode == MODE_HTML) ? LOG_FILE_HTML
|
|
|
|
|
: LOG_FILE_TEXT ) == -1 )
|
|
|
|
|
psz_file = NULL;
|
2005-11-30 00:12:52 +01:00
|
|
|
#else
|
2004-03-27 18:36:46 +01:00
|
|
|
switch( p_intf->p_sys->i_mode )
|
|
|
|
|
{
|
|
|
|
|
case MODE_HTML:
|
2005-11-30 00:12:52 +01:00
|
|
|
psz_file = strdup( LOG_FILE_HTML );
|
2004-03-27 18:36:46 +01:00
|
|
|
break;
|
|
|
|
|
case MODE_TEXT:
|
|
|
|
|
default:
|
2005-11-30 00:12:52 +01:00
|
|
|
psz_file = strdup( LOG_FILE_TEXT );
|
2004-03-27 18:36:46 +01:00
|
|
|
break;
|
|
|
|
|
}
|
2005-11-30 00:12:52 +01:00
|
|
|
#endif
|
|
|
|
|
msg_Warn( p_intf, "no log filename provided, using `%s'",
|
|
|
|
|
psz_file );
|
2004-03-27 18:36:46 +01:00
|
|
|
}
|
2005-11-30 00:12:52 +01:00
|
|
|
|
|
|
|
|
/* Open the log file and remove any buffering for the stream */
|
|
|
|
|
msg_Dbg( p_intf, "opening logfile `%s'", psz_file );
|
2006-10-04 19:13:02 +02:00
|
|
|
p_intf->p_sys->p_file = utf8_fopen( psz_file, "at" );
|
2005-11-30 00:12:52 +01:00
|
|
|
if( p_intf->p_sys->p_file == NULL )
|
|
|
|
|
{
|
|
|
|
|
msg_Err( p_intf, "error opening logfile `%s'", psz_file );
|
|
|
|
|
free( p_intf->p_sys );
|
|
|
|
|
free( psz_file );
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
setvbuf( p_intf->p_sys->p_file, NULL, _IONBF, 0 );
|
|
|
|
|
|
|
|
|
|
free( psz_file );
|
|
|
|
|
|
2005-08-05 20:44:47 +02:00
|
|
|
switch( p_intf->p_sys->i_mode )
|
2002-08-04 19:23:44 +02:00
|
|
|
{
|
|
|
|
|
case MODE_HTML:
|
2005-11-30 00:12:52 +01:00
|
|
|
LOG_STRING( HTML_HEADER, p_intf->p_sys->p_file );
|
2002-08-04 19:23:44 +02:00
|
|
|
break;
|
|
|
|
|
case MODE_TEXT:
|
|
|
|
|
default:
|
2005-11-30 00:12:52 +01:00
|
|
|
LOG_STRING( TEXT_HEADER, p_intf->p_sys->p_file );
|
2002-08-04 19:23:44 +02:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
2005-11-30 00:12:52 +01:00
|
|
|
else
|
2002-08-04 19:23:44 +02:00
|
|
|
{
|
2005-11-30 00:12:52 +01:00
|
|
|
p_intf->p_sys->p_file = NULL;
|
|
|
|
|
#ifdef HAVE_SYSLOG_H
|
2008-03-14 11:22:45 +01:00
|
|
|
openlog( "vlc", LOG_PID|LOG_NDELAY, LOG_DAEMON );
|
2005-11-30 00:12:52 +01:00
|
|
|
#endif
|
2002-08-04 19:23:44 +02:00
|
|
|
}
|
|
|
|
|
|
2006-01-28 11:56:47 +01:00
|
|
|
p_intf->p_sys->last_update = 0;
|
|
|
|
|
p_intf->p_sys->p_rrd = NULL;
|
|
|
|
|
|
|
|
|
|
psz_rrd_file = config_GetPsz( p_intf, "rrd-file" );
|
|
|
|
|
if( psz_rrd_file && *psz_rrd_file )
|
|
|
|
|
{
|
2006-02-13 11:30:30 +01:00
|
|
|
p_intf->p_sys->p_rrd = utf8_fopen( psz_rrd_file, "w" );
|
2006-01-28 11:56:47 +01:00
|
|
|
}
|
|
|
|
|
|
2008-05-10 11:57:12 +02:00
|
|
|
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
|
2002-08-24 19:04:36 +02:00
|
|
|
p_intf->pf_run = Run;
|
|
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* Close: destroy interface stuff
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
static void Close( vlc_object_t *p_this )
|
2005-11-30 00:12:52 +01:00
|
|
|
{
|
2002-08-04 19:23:44 +02:00
|
|
|
intf_thread_t *p_intf = (intf_thread_t *)p_this;
|
2005-11-30 00:12:52 +01:00
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
/* Flush the queue and unsubscribe from the message queue */
|
|
|
|
|
FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
|
2008-05-05 09:51:07 +02:00
|
|
|
p_intf->p_sys->i_mode,
|
|
|
|
|
var_CreateGetInteger( p_intf, "verbose" ) );
|
2002-08-04 19:23:44 +02:00
|
|
|
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
|
|
|
|
|
|
|
|
|
|
switch( p_intf->p_sys->i_mode )
|
|
|
|
|
{
|
|
|
|
|
case MODE_HTML:
|
|
|
|
|
LOG_STRING( HTML_FOOTER, p_intf->p_sys->p_file );
|
|
|
|
|
break;
|
|
|
|
|
case MODE_TEXT:
|
2005-11-30 00:12:52 +01:00
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
|
|
|
case MODE_SYSLOG:
|
|
|
|
|
closelog();
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
2002-08-04 19:23:44 +02:00
|
|
|
default:
|
|
|
|
|
LOG_STRING( TEXT_FOOTER, p_intf->p_sys->p_file );
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Close the log file */
|
2005-11-30 00:12:52 +01:00
|
|
|
if( p_intf->p_sys->i_mode != MODE_SYSLOG )
|
|
|
|
|
fclose( p_intf->p_sys->p_file );
|
2002-08-04 19:23:44 +02:00
|
|
|
|
|
|
|
|
/* Destroy structure */
|
|
|
|
|
free( p_intf->p_sys );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
|
|
|
|
* Run: rc thread
|
|
|
|
|
*****************************************************************************
|
|
|
|
|
* This part of the interface is in a separate thread so that we can call
|
|
|
|
|
* exec() from within it without annoying the rest of the program.
|
|
|
|
|
*****************************************************************************/
|
|
|
|
|
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,
|
2008-05-05 09:51:07 +02:00
|
|
|
p_intf->p_sys->i_mode,
|
|
|
|
|
var_CreateGetInteger( p_intf, "verbose" ) );
|
2006-01-28 11:56:47 +01:00
|
|
|
if( p_intf->p_sys->p_rrd )
|
|
|
|
|
DoRRD( p_intf );
|
|
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
msleep( INTF_IDLE_SLEEP );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*****************************************************************************
|
2005-11-30 00:12:52 +01:00
|
|
|
* FlushQueue: flush the message queue into the log
|
2002-08-04 19:23:44 +02:00
|
|
|
*****************************************************************************/
|
2008-03-12 23:13:11 +01:00
|
|
|
static void FlushQueue( msg_subscription_t *p_sub, FILE *p_file, int i_mode,
|
|
|
|
|
int i_verbose )
|
2002-08-04 19:23:44 +02:00
|
|
|
{
|
|
|
|
|
int i_start, i_stop;
|
|
|
|
|
|
|
|
|
|
vlc_mutex_lock( p_sub->p_lock );
|
|
|
|
|
i_stop = *p_sub->pi_stop;
|
|
|
|
|
vlc_mutex_unlock( p_sub->p_lock );
|
|
|
|
|
|
|
|
|
|
if( p_sub->i_start != i_stop )
|
|
|
|
|
{
|
|
|
|
|
/* Append all messages to log file */
|
|
|
|
|
for( i_start = p_sub->i_start;
|
|
|
|
|
i_start != i_stop;
|
|
|
|
|
i_start = (i_start+1) % VLC_MSG_QSIZE )
|
|
|
|
|
{
|
2008-03-12 23:13:11 +01:00
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
switch( i_mode )
|
|
|
|
|
{
|
|
|
|
|
case MODE_HTML:
|
|
|
|
|
HtmlPrint( &p_sub->p_msg[i_start], p_file );
|
|
|
|
|
break;
|
2005-11-30 00:12:52 +01:00
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
|
|
|
case MODE_SYSLOG:
|
|
|
|
|
SyslogPrint( &p_sub->p_msg[i_start] );
|
|
|
|
|
break;
|
|
|
|
|
#endif
|
2002-08-04 19:23:44 +02:00
|
|
|
case MODE_TEXT:
|
|
|
|
|
default:
|
|
|
|
|
TextPrint( &p_sub->p_msg[i_start], p_file );
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
vlc_mutex_lock( p_sub->p_lock );
|
|
|
|
|
p_sub->i_start = i_start;
|
|
|
|
|
vlc_mutex_unlock( p_sub->p_lock );
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static const char *ppsz_type[4] = { ": ", " error: ",
|
|
|
|
|
" warning: ", " debug: " };
|
|
|
|
|
|
|
|
|
|
static void TextPrint( const msg_item_t *p_msg, FILE *p_file )
|
|
|
|
|
{
|
|
|
|
|
LOG_STRING( p_msg->psz_module, p_file );
|
|
|
|
|
LOG_STRING( ppsz_type[p_msg->i_type], p_file );
|
|
|
|
|
LOG_STRING( p_msg->psz_msg, p_file );
|
|
|
|
|
LOG_STRING( "\n", p_file );
|
|
|
|
|
}
|
|
|
|
|
|
2005-11-30 00:12:52 +01:00
|
|
|
#ifdef HAVE_SYSLOG_H
|
|
|
|
|
static void SyslogPrint( const msg_item_t *p_msg )
|
|
|
|
|
{
|
2008-03-12 23:13:11 +01:00
|
|
|
static const int i_prio[4] = { LOG_INFO, LOG_ERR, LOG_WARNING, LOG_DEBUG };
|
|
|
|
|
int i_priority = i_prio[p_msg->i_type];
|
2005-11-30 00:12:52 +01:00
|
|
|
|
2006-01-31 16:11:08 +01:00
|
|
|
if( p_msg->psz_header )
|
2008-03-12 23:13:11 +01:00
|
|
|
syslog( i_priority, "%s%s %s: %s", p_msg->psz_header,
|
|
|
|
|
ppsz_type[p_msg->i_type],
|
2006-01-31 16:11:08 +01:00
|
|
|
p_msg->psz_module, p_msg->psz_msg );
|
|
|
|
|
else
|
2008-03-12 23:13:11 +01:00
|
|
|
syslog( i_priority, "%s%s: %s", p_msg->psz_module,
|
|
|
|
|
ppsz_type[p_msg->i_type], p_msg->psz_msg );
|
2007-09-10 20:56:52 +02:00
|
|
|
|
2005-11-30 00:12:52 +01:00
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-08-04 19:23:44 +02:00
|
|
|
static void HtmlPrint( const msg_item_t *p_msg, FILE *p_file )
|
|
|
|
|
{
|
2007-09-13 18:24:27 +02:00
|
|
|
static const char *ppsz_color[4] = { "<span style=\"color: #ffffff\">",
|
|
|
|
|
"<span style=\"color: #ff6666\">",
|
|
|
|
|
"<span style=\"color: #ffff66\">",
|
|
|
|
|
"<span style=\"color: #aaaaaa\">" };
|
2002-08-04 19:23:44 +02:00
|
|
|
|
|
|
|
|
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 );
|
2007-09-13 18:24:27 +02:00
|
|
|
LOG_STRING( "</span>\n", p_file );
|
2002-08-04 19:23:44 +02:00
|
|
|
}
|
|
|
|
|
|
2006-01-28 11:56:47 +01:00
|
|
|
static void DoRRD( intf_thread_t *p_intf )
|
|
|
|
|
{
|
|
|
|
|
if( mdate() - p_intf->p_sys->last_update < 1000000 )
|
|
|
|
|
return;
|
|
|
|
|
p_intf->p_sys->last_update = mdate();
|
|
|
|
|
|
2008-03-29 21:53:12 +01:00
|
|
|
if( p_intf->p_libvlc->p_stats )
|
2006-01-28 11:56:47 +01:00
|
|
|
{
|
2008-05-20 15:23:35 +02:00
|
|
|
time(&p_intf->p_sys->now);
|
2008-03-29 21:53:12 +01:00
|
|
|
lldiv_t din = lldiv( p_intf->p_libvlc->p_stats->f_input_bitrate * 1000000,
|
2006-03-11 20:23:58 +01:00
|
|
|
1000 );
|
2008-03-29 21:53:12 +01:00
|
|
|
lldiv_t ddm = lldiv( p_intf->p_libvlc->p_stats->f_demux_bitrate * 1000000,
|
2006-03-11 20:23:58 +01:00
|
|
|
1000 );
|
2008-03-29 21:53:12 +01:00
|
|
|
lldiv_t dout = lldiv( p_intf->p_libvlc->p_stats->f_output_bitrate * 1000000,
|
2006-03-11 20:23:58 +01:00
|
|
|
1000 );
|
|
|
|
|
fprintf( p_intf->p_sys->p_rrd,
|
2008-05-01 20:57:00 +02:00
|
|
|
"%"PRIi64":%lld.%03u:%lld.%03u:%lld.%03u\n",
|
2008-05-20 15:23:35 +02:00
|
|
|
(uintmax_t)p_intf->p_sys->now,
|
2006-03-11 20:23:58 +01:00
|
|
|
din.quot, (unsigned int)din.rem,
|
|
|
|
|
ddm.quot, (unsigned int)ddm.rem,
|
|
|
|
|
dout.quot, (unsigned int)dout.rem );
|
2006-01-28 11:56:47 +01:00
|
|
|
fflush( p_intf->p_sys->p_rrd );
|
|
|
|
|
}
|
|
|
|
|
}
|