Skip to content

GitLab

Switch branch/tag
Find file Normal viewHistoryPermalink
logger.c 14.4 KB
Newer Older
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
1 2 3 
/*****************************************************************************
 * logger.c : file logging plugin for vlc
 *****************************************************************************
Rémi Denis-Courmont's avatar
Make Zorglub less unhappy  
Rémi Denis-Courmont committed
4 
 * Copyright (C) 2002 the VideoLAN team
Clément Stenac's avatar
* Remove directories with only one source file inside  
Clément Stenac committed
5 
 * $Id$
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
6 7 8 9 10 11 12 
 *
 * 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.
Clément Stenac's avatar
* A few string and organization fixes in preferences  
Clément Stenac committed
13 
 *
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
14 15 16 17 18 19 20 
 * 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
Antoine Cellerier's avatar
FSF address change.  
Antoine Cellerier committed
21 
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
22 23 24 25 26 27 
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/
Rémi Denis-Courmont's avatar
Don't include config.h from the headers - refs #297.  
Rémi Denis-Courmont committed
28 29 30 31 
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Rémi Denis-Courmont's avatar
Plugins: include vlc_common.h directly instead of vlc/vlc.h  
Rémi Denis-Courmont committed
32 
#include <vlc_common.h>
Rémi Denis-Courmont's avatar
Include vlc_plugin.h as needed  
Rémi Denis-Courmont committed
33 
#include <vlc_plugin.h>
Rémi Denis-Courmont's avatar
#include order  
Rémi Denis-Courmont committed
34 35 36 37 
#include <vlc_interface.h>
#include <vlc_playlist.h>
#include <vlc_charset.h>
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
38 39 
#include <errno.h>                                                 /* ENOMEM */
Gildas Bazin's avatar
* modules/access/mms, modules/demux/mp4, modules/misc/logger.c: WinCE compilation fixes.  
Gildas Bazin committed
40 41 42 43 
#ifdef UNDER_CE
#   define _IONBF 0x0004
#endif
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
44 45 
#define MODE_TEXT 0
#define MODE_HTML 1
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
46 
#define MODE_SYSLOG 2
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
47
Sam Hocevar's avatar
* Got rid of SYS_DARWIN everywhere.  
Sam Hocevar committed
48 
#ifdef __APPLE__
Derk-Jan Hartman's avatar
* src/interface/interface.c  
Derk-Jan Hartman committed
49 50 51 52 53 54 
#define LOG_DIR "Library/Logs/"
#endif

#define LOG_FILE_TEXT "vlc-log.txt"
#define LOG_FILE_HTML "vlc-log.html"
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
55 56 57 58 59 60 
#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 \
Rafaël Carré's avatar
// is valid inside "", despite what my vim says  
Rafaël Carré committed
61 62 
    "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01//EN\"\n" \
    "  \"http://www.w3.org/TR/html4/strict.dtd\">\n" \
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
63 64 65 
    "<html>\n" \
    "  <head>\n" \
    "    <title>vlc log</title>\n" \
Rafaël Carré's avatar
Makes logger html output « Valid HTML 4.01 Strict! », thanks to dionoea  
Rafaël Carré committed
66 
    "    <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" \
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
67 
    "  </head>\n" \
Rafaël Carré's avatar
Makes logger html output « Valid HTML 4.01 Strict! », thanks to dionoea  
Rafaël Carré committed
68 
    "  <body style=\"background-color: #000000; color: #aaaaaa;\">\n" \
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
69 70 71 72 73 74 75 76 
    "    <pre>\n" \
    "      <b>-- logger module started --</b>\n"
#define HTML_FOOTER \
    "      <b>-- logger module stopped --</b>\n" \
    "    </pre>\n" \
    "  </body>\n" \
    "</html>\n"
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
77 78 79 80 
#if HAVE_SYSLOG_H
#include <syslog.h>
#endif
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
81 82 83 84 85 86 
/*****************************************************************************
 * intf_sys_t: description and status of log interface
 *****************************************************************************/
struct intf_sys_t
{
    int i_mode;
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
87 88 
    FILE *p_rrd;
    mtime_t last_update;
Ilkka Ollakka's avatar
modify logger-module rrd-output to use time for timestamp instead of mdate()  
Ilkka Ollakka committed
89 
    time_t now;  /* timestamp for rrd-log */
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
90 91 92 93 94 95 96 97 

    FILE *    p_file; /* The log file */
    msg_subscription_t *p_sub;
};

/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
Clément Stenac's avatar
* A few string and organization fixes in preferences  
Clément Stenac committed
98 
static int  Open    ( vlc_object_t * );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
99 100 101 
static void Close   ( vlc_object_t * );
static void Run     ( intf_thread_t * );
Rafaël Carré's avatar
Improvements to syslog logger - by Hans Lambermont  
Rafaël Carré committed
102 
static void FlushQueue        ( msg_subscription_t *, FILE *, int, int );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
103 104 
static void TextPrint         ( const msg_item_t *, FILE * );
static void HtmlPrint         ( const msg_item_t *, FILE * );
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
105 106 107 
#ifdef HAVE_SYSLOG_H
static void SyslogPrint       ( const msg_item_t *);
#endif
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
108
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
109 110 
static void DoRRD( intf_thread_t *p_intf );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
111 112 113 
/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
Rémi Denis-Courmont's avatar
A lot of missing const in options lists  
Rémi Denis-Courmont committed
114 
static const char *const mode_list[] = { "text", "html"
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
115 116 117 118 
#ifdef HAVE_SYSLOG_H
,"syslog"
#endif
};
Rémi Denis-Courmont's avatar
A lot of missing const in options lists  
Rémi Denis-Courmont committed
119 
static const char *const mode_list_text[] = { N_("Text"), "HTML"
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
120 121 122 123 
#ifdef HAVE_SYSLOG_H
, "syslog"
#endif
};
Gildas Bazin's avatar
* include/configuration.h: some small re-work of the config declaration macros.  
Gildas Bazin committed
124
Christophe Massiot's avatar
* now 0.6.0-cvs  
Christophe Massiot committed
125 
#define LOGMODE_TEXT N_("Log format")
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
126 
#ifdef HAVE_SYSLOG_H
Clément Stenac's avatar
Strings review in misc/ except dummy and win32text (Refs:#438)  
Clément Stenac committed
127 128 129 
#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.")
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
130 
#else
Clément Stenac's avatar
Strings review in misc/ except dummy and win32text (Refs:#438)  
Clément Stenac committed
131 
#define LOGMODE_LONGTEXT N_("Specify the log format. Available choices are " \
Christophe Mutricy's avatar
logger.c: Compile fix  
Christophe Mutricy committed
132 
  "\"text\" (default) and \"html\".")
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
133 
#endif
Christophe Massiot's avatar
* now 0.6.0-cvs  
Christophe Massiot committed
134
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
135 
vlc_module_begin();
Rémi Denis-Courmont's avatar
Use gettext_noop() consistently  
Rémi Denis-Courmont committed
136 137 
    set_shortname( N_( "Logging" ) );
    set_description( N_("File logging") );
Gildas Bazin's avatar
 
Gildas Bazin committed
138
Christophe Mutricy's avatar
all: move the logger option from video to interface and advanced  
Christophe Mutricy committed
139 140 141 
    set_category( CAT_ADVANCED );
    set_subcategory( SUBCAT_ADVANCED_MISC );
Clément Stenac's avatar
* Make ParseOption (from input) a global service (var_OptionParse)  
Clément Stenac committed
142 
    add_file( "logfile", NULL, NULL,
Pierre d'Herbemont's avatar
Replace vlc_bool_t by bool, VLC_TRUE by true and VLC_FALSE by false.  
Pierre d'Herbemont committed
143 
             N_("Log filename"), N_("Specify the log filename."), false );
Gildas Bazin's avatar
* include/configuration.h: some small re-work of the config declaration macros.  
Gildas Bazin committed
144 
    add_string( "logmode", "text", NULL, LOGMODE_TEXT, LOGMODE_LONGTEXT,
Pierre d'Herbemont's avatar
Replace vlc_bool_t by bool, VLC_TRUE by true and VLC_FALSE by false.  
Pierre d'Herbemont committed
145 
                false );
Gildas Bazin's avatar
* include/configuration.h: some small re-work of the config declaration macros.  
Gildas Bazin committed
146 
        change_string_list( mode_list, mode_list_text, 0 );
Gildas Bazin's avatar
 
Gildas Bazin committed
147
Christophe Mutricy's avatar
misc/*: 2nd lecture. refs #438  
Christophe Mutricy committed
148 
    add_file( "rrd-file", NULL, NULL, N_("RRD output file") ,
Pierre d'Herbemont's avatar
Replace vlc_bool_t by bool, VLC_TRUE by true and VLC_FALSE by false.  
Pierre d'Herbemont committed
149 
                    N_("Output data for RRDTool in this file." ), true );
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
150
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
151 152 153 154 155 156 157 158 
    set_capability( "interface", 0 );
    set_callbacks( Open, Close );
vlc_module_end();

/*****************************************************************************
 * Open: initialize and create stuff
 *****************************************************************************/
static int Open( vlc_object_t *p_this )
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
159 
{
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
160 
    intf_thread_t *p_intf = (intf_thread_t *)p_this;
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
161 
    char *psz_mode, *psz_file, *psz_rrd_file;
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
162
Gildas Bazin's avatar
 
Gildas Bazin committed
163 
    CONSOLE_INTRO_MSG;
Christophe Mutricy's avatar
misc/*: 2nd lecture. refs #438  
Christophe Mutricy committed
164 
    msg_Info( p_intf, "using logger..." );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
165 166 167 168 169 170 

    /* Allocate instance and initialize some members */
    p_intf->p_sys = (intf_sys_t *)malloc( sizeof( intf_sys_t ) );
    if( p_intf->p_sys == NULL )
        return -1;
Clément Stenac's avatar
* Make ParseOption (from input) a global service (var_OptionParse)  
Clément Stenac committed
171 
    psz_mode = var_CreateGetString( p_intf, "logmode" );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
172 173 174 175 176 177 178 179 180 181 
    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;
        }
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
182 183 184 185 186 187 
#ifdef HAVE_SYSLOG_H
        else if( !strcmp( psz_mode, "syslog" ) )
        {
            p_intf->p_sys->i_mode = MODE_SYSLOG;
        }
#endif
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
188 189 
        else
        {
Clément Stenac's avatar
Strings review in misc/ except dummy and win32text (Refs:#438)  
Clément Stenac committed
190 
            msg_Warn( p_intf, "invalid log mode `%s', using `text'", psz_mode );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
191 192 193 194 195 196 197 198 199 200 201 
            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;
    }
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
202 
    if( p_intf->p_sys->i_mode != MODE_SYSLOG )
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
203 
    {
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
204 205 206 
        psz_file = config_GetPsz( p_intf, "logfile" );
        if( !psz_file )
        {
Sam Hocevar's avatar
* Got rid of SYS_DARWIN everywhere.  
Sam Hocevar committed
207 
#ifdef __APPLE__
Rémi Denis-Courmont's avatar
Remove libvlc->psz_homedir and use config_GetHomeDir() instead  
Rémi Denis-Courmont committed
208 209 210 211 
            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;
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
212 
#else
Derk-Jan Hartman's avatar
* src/interface/interface.c  
Derk-Jan Hartman committed
213 214 215 
            switch( p_intf->p_sys->i_mode )
            {
            case MODE_HTML:
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
216 
                psz_file = strdup( LOG_FILE_HTML );
Derk-Jan Hartman's avatar
* src/interface/interface.c  
Derk-Jan Hartman committed
217 218 219 
                break;
            case MODE_TEXT:
            default:
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
220 
                psz_file = strdup( LOG_FILE_TEXT );
Derk-Jan Hartman's avatar
* src/interface/interface.c  
Derk-Jan Hartman committed
221 222 
                break;
            }
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
223 224 225 
#endif
            msg_Warn( p_intf, "no log filename provided, using `%s'",
                               psz_file );
Derk-Jan Hartman's avatar
* src/interface/interface.c  
Derk-Jan Hartman committed
226 
        }
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
227 228 229 

        /* Open the log file and remove any buffering for the stream */
        msg_Dbg( p_intf, "opening logfile `%s'", psz_file );
Sam Hocevar's avatar
* modules/misc/logger.c: don't truncate logfile upon creation.  
Sam Hocevar committed
230 
        p_intf->p_sys->p_file = utf8_fopen( psz_file, "at" );
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
231 232 233 234 235 236 237 238 239 240 241 
        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 );
Christophe Massiot's avatar
* modules/control/http.c: Support for ~ in foreach directory.  
Christophe Massiot committed
242 
        switch( p_intf->p_sys->i_mode )
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
243 244 
        {
        case MODE_HTML:
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
245 
            LOG_STRING( HTML_HEADER, p_intf->p_sys->p_file );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
246 247 248 
            break;
        case MODE_TEXT:
        default:
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
249 
            LOG_STRING( TEXT_HEADER, p_intf->p_sys->p_file );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
250 251 252 253 
            break;
        }

    }
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
254 
    else
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
255 
    {
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
256 257 
        p_intf->p_sys->p_file = NULL;
#ifdef HAVE_SYSLOG_H
Rafaël Carré's avatar
fix [0cd7064a1b656cd87e61af14b74ec6c80c341fe6] : lower case "VLC"  
Rafaël Carré committed
258 
        openlog( "vlc", LOG_PID|LOG_NDELAY, LOG_DAEMON );
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
259 
#endif
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
260 261 
    }
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
262 263 264 265 266 267 
    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 )
    {
Rémi Denis-Courmont's avatar
Further fopen() unicode fixes (refs #528)  
Rémi Denis-Courmont committed
268 
        p_intf->p_sys->p_rrd = utf8_fopen( psz_rrd_file, "w" );
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
269 
    }
Rémi Duraffort's avatar
Fix memleaks.  
Rémi Duraffort committed
270 
    free( psz_rrd_file );
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
271
Rémi Denis-Courmont's avatar
Remove message unused "queue" parameter  
Rémi Denis-Courmont committed
272 
    p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
Gildas Bazin's avatar
 
Gildas Bazin committed
273 274 
    p_intf->pf_run = Run;
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
275 276 277 278 279 280 281 
    return 0;
}

/*****************************************************************************
 * Close: destroy interface stuff
 *****************************************************************************/
static void Close( vlc_object_t *p_this )
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
282 
{
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
283 
    intf_thread_t *p_intf = (intf_thread_t *)p_this;
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
284
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
285 286 
    /* Flush the queue and unsubscribe from the message queue */
    FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
Rafaël Carré's avatar
Use the verbose variable, over the private i_verbose member  
Rafaël Carré committed
287 288 
                p_intf->p_sys->i_mode,
                var_CreateGetInteger( p_intf, "verbose" ) );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
289 290 291 292 293 294 295 296 
    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:
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
297 298 299 300 301 
#ifdef HAVE_SYSLOG_H
    case MODE_SYSLOG:
        closelog();
        break;
#endif
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
302 303 304 305 306 307 
    default:
        LOG_STRING( TEXT_FOOTER, p_intf->p_sys->p_file );
        break;
    }

    /* Close the log file */
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
308 309 
    if( p_intf->p_sys->i_mode != MODE_SYSLOG )
        fclose( p_intf->p_sys->p_file );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
310 311 312 313 314 315 316 317 318 319 320 321 322 

    /* 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 )
{
Rémi Denis-Courmont's avatar
Pull cancellation into (most) remaining interfaces  
Rémi Denis-Courmont committed
323 
    for( ;; )
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
324 
    {
Rémi Denis-Courmont's avatar
Pull cancellation into (most) remaining interfaces  
Rémi Denis-Courmont committed
325 
        int canc = vlc_savecancel();
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
326 
        FlushQueue( p_intf->p_sys->p_sub, p_intf->p_sys->p_file,
Rafaël Carré's avatar
Use the verbose variable, over the private i_verbose member  
Rafaël Carré committed
327 328 
                    p_intf->p_sys->i_mode,
                    var_CreateGetInteger( p_intf, "verbose" ) );
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
329 330 331 
        if( p_intf->p_sys->p_rrd )
            DoRRD( p_intf );
Rémi Denis-Courmont's avatar
Pull cancellation into (most) remaining interfaces  
Rémi Denis-Courmont committed
332 333 
        vlc_restorecancel( canc );
        /* FIXME: this is WRONG. */
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
334 335 336 337 338 
        msleep( INTF_IDLE_SLEEP );
    }
}

/*****************************************************************************
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
339 
 * FlushQueue: flush the message queue into the log
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
340 
 *****************************************************************************/
Rafaël Carré's avatar
Improvements to syslog logger - by Hans Lambermont  
Rafaël Carré committed
341 342 
static void FlushQueue( msg_subscription_t *p_sub, FILE *p_file, int i_mode,
                        int i_verbose )
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
343 344 345 346 347 348 349 350 351 352 353 354 355 356 
{
    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 )
        {
Rafaël Carré's avatar
Improvements to syslog logger - by Hans Lambermont  
Rafaël Carré committed
357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 
            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;
            }
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
373 374 375 376 377 
            switch( i_mode )
            {
            case MODE_HTML:
                HtmlPrint( &p_sub->p_msg[i_start], p_file );
                break;
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
378 379 380 381 382 
#ifdef HAVE_SYSLOG_H
            case MODE_SYSLOG:
                SyslogPrint( &p_sub->p_msg[i_start] );
                break;
#endif
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 
            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 );
}
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
407 408 409 
#ifdef HAVE_SYSLOG_H
static void SyslogPrint( const msg_item_t *p_msg )
{
Rafaël Carré's avatar
Improvements to syslog logger - by Hans Lambermont  
Rafaël Carré committed
410 411 
    static const int i_prio[4] = { LOG_INFO, LOG_ERR, LOG_WARNING, LOG_DEBUG };
    int i_priority = i_prio[p_msg->i_type];
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
412
Sigmund Augdal Helberg's avatar
logger.c: put in header prefix for syslog output (still missing for text  
Sigmund Augdal Helberg committed
413 
    if( p_msg->psz_header )
Rafaël Carré's avatar
Improvements to syslog logger - by Hans Lambermont  
Rafaël Carré committed
414 415 
        syslog( i_priority, "%s%s %s: %s", p_msg->psz_header,
                ppsz_type[p_msg->i_type],
Sigmund Augdal Helberg's avatar
logger.c: put in header prefix for syslog output (still missing for text  
Sigmund Augdal Helberg committed
416 417 
                p_msg->psz_module, p_msg->psz_msg );
    else
Rafaël Carré's avatar
Improvements to syslog logger - by Hans Lambermont  
Rafaël Carré committed
418 419 
        syslog( i_priority, "%s%s: %s", p_msg->psz_module, 
                ppsz_type[p_msg->i_type], p_msg->psz_msg );
Rafaël Carré's avatar
Removes trailing spaces. Removes tabs.  
Rafaël Carré committed
420
Clément Stenac's avatar
Add ability to log to syslog (Closes:#334)  
Clément Stenac committed
421 422 423 
}
#endif
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
424 425 
static void HtmlPrint( const msg_item_t *p_msg, FILE *p_file )
{
Rafaël Carré's avatar
Makes logger html output « Valid HTML 4.01 Strict! », thanks to dionoea  
Rafaël Carré committed
426 427 428 429 
    static const char *ppsz_color[4] = { "<span style=\"color: #ffffff\">",
                                         "<span style=\"color: #ff6666\">",
                                         "<span style=\"color: #ffff66\">",
                                         "<span style=\"color: #aaaaaa\">" };
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
430 431 432 433 434 

    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 );
Rafaël Carré's avatar
Makes logger html output « Valid HTML 4.01 Strict! », thanks to dionoea  
Rafaël Carré committed
435 
    LOG_STRING( "</span>\n", p_file );
Sam Hocevar's avatar
* ./modules/*: moved plugins to the new tree. Yet untested builds include  
Sam Hocevar committed
436 437 
}
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
438 439 
static void DoRRD( intf_thread_t *p_intf )
{
Rémi Duraffort's avatar
Don't call mdate too many times.  
Rémi Duraffort committed
440 441 
    mtime_t now = mdate();
    if( now - p_intf->p_sys->last_update < 1000000 )
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
442 
        return;
Rémi Duraffort's avatar
Don't call mdate too many times.  
Rémi Duraffort committed
443 
    p_intf->p_sys->last_update = now;
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
444
Pierre's avatar
stats: Move the stat to libvlc instead of the playlist. As stated in the code...  
Pierre committed
445 
    if( p_intf->p_libvlc->p_stats )
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
446 
    {
Ilkka Ollakka's avatar
modify logger-module rrd-output to use time for timestamp instead of mdate()  
Ilkka Ollakka committed
447 
        time(&p_intf->p_sys->now);
Pierre's avatar
stats: Move the stat to libvlc instead of the playlist. As stated in the code...  
Pierre committed
448 
        lldiv_t din = lldiv( p_intf->p_libvlc->p_stats->f_input_bitrate * 1000000,
Clément Stenac's avatar
Don't use %f in RRD output (Closes:#582)  
Clément Stenac committed
449 
                             1000 );
Pierre's avatar
stats: Move the stat to libvlc instead of the playlist. As stated in the code...  
Pierre committed
450 
        lldiv_t ddm = lldiv( p_intf->p_libvlc->p_stats->f_demux_bitrate * 1000000,
Clément Stenac's avatar
Don't use %f in RRD output (Closes:#582)  
Clément Stenac committed
451 
                             1000 );
Pierre's avatar
stats: Move the stat to libvlc instead of the playlist. As stated in the code...  
Pierre committed
452 
        lldiv_t dout = lldiv( p_intf->p_libvlc->p_stats->f_output_bitrate * 1000000,
Clément Stenac's avatar
Don't use %f in RRD output (Closes:#582)  
Clément Stenac committed
453 454 
                             1000 );
        fprintf( p_intf->p_sys->p_rrd,
Rémi Denis-Courmont's avatar
NIH syndrome cure (2)  
Rémi Denis-Courmont committed
455 
                   "%"PRIi64":%lld.%03u:%lld.%03u:%lld.%03u\n",
Ilkka Ollakka's avatar
modify logger-module rrd-output to use time for timestamp instead of mdate()  
Ilkka Ollakka committed
456 
                   (uintmax_t)p_intf->p_sys->now,
Clément Stenac's avatar
Don't use %f in RRD output (Closes:#582)  
Clément Stenac committed
457 458 459 
                   din.quot, (unsigned int)din.rem,
                   ddm.quot, (unsigned int)ddm.rem,
                   dout.quot, (unsigned int)dout.rem );
Clément Stenac's avatar
RRD output (Refs:#473)  
Clément Stenac committed
460 461 462 
        fflush( p_intf->p_sys->p_rrd );
    }
}