~ubuntu-dev/ubuntu/lucid/mpd/lucid-201002110916

Viewing changes to src/log.c

Committer: Bazaar Package Importer
Author(s): Alessio Treglia
Date: 2009-10-23 12:38:20 UTC
mfrom: (1.1.12 upstream) (2.2.6 sid)
Revision ID: james.westby@ubuntu.com-20091023123820-rxt21lmekscxbkbt

Tags: 0.15.4-1ubuntu1

* Merge from debian unstable, Ubuntu remaining changes:
  - debian/control:
    + Don't build-depends on libmikmod2-dev (Debian bug #510675).
    + Move avahi-daemon from Suggests field to Recommends field.
  - debian/mpd.init.d:
    + Read mpd user from mpd.conf.
* Also fixes LP: #332332.

files added:
doc/developer.xml

doc/doxygen.conf

doc/sticker.xml

doc/user.xml

m4/faad.m4

m4/mpd_auto.m4

src/aiff.c

src/aiff.h

src/archive

src/archive/bz2_plugin.c

src/archive/iso_plugin.c

src/archive/zip_plugin.c

src/archive_api.c

src/archive_api.h

src/archive_internal.h

src/archive_list.c

src/archive_list.h

src/audio_parser.c

src/audio_parser.h

src/buffer.c

src/buffer.h

src/chunk.c

src/chunk.h

src/cmdline.c

src/cmdline.h

src/cue

src/cue/cue_tag.c

src/cue/cue_tag.h

src/daemon.c

src/daemon.h

src/decoder/faad_plugin.c

src/decoder/fluidsynth_plugin.c

src/decoder/mad_plugin.c

src/decoder/mikmod_plugin.c

src/decoder/modplug_plugin.c

src/decoder/mp4ff_plugin.c

src/decoder/mpcdec_plugin.c

src/decoder/sidplay_plugin.cxx

src/decoder/vorbis_plugin.c

src/decoder/wildmidi_plugin.c

src/decoder_buffer.c

src/decoder_buffer.h

src/decoder_command.h

src/decoder_internal.c

src/decoder_plugin.h

src/encoder

src/encoder/lame_encoder.c

src/encoder/vorbis_encoder.c

src/encoder_api.h

src/encoder_list.c

src/encoder_list.h

src/encoder_plugin.h

src/event_pipe.c

src/event_pipe.h

src/fifo_buffer.c

src/fifo_buffer.h

src/icy_metadata.c

src/icy_metadata.h

src/icy_server.c

src/icy_server.h

src/input

src/input/archive_input_plugin.c

src/input/archive_input_plugin.h

src/input/curl_input_plugin.c

src/input/curl_input_plugin.h

src/input/file_input_plugin.c

src/input/file_input_plugin.h

src/input/lastfm_input_plugin.c

src/input/lastfm_input_plugin.h

src/input/mms_input_plugin.c

src/input/mms_input_plugin.h

src/input_plugin.h

src/main.h

src/mixer

src/mixer/alsa_mixer.c

src/mixer/oss_mixer.c

src/mixer/pulse_mixer.c

src/mixer_all.c

src/mixer_all.h

src/mixer_api.c

src/mixer_api.h

src/mixer_control.c

src/mixer_control.h

src/mixer_list.h

src/mixer_plugin.h

src/output/httpd_client.c

src/output/httpd_client.h

src/output/httpd_internal.h

src/output/httpd_output_plugin.c

src/output/pipe_output_plugin.c

src/output/solaris_output_plugin.c

src/output_all.c

src/output_all.h

src/output_command.c

src/output_command.h

src/output_plugin.h

src/output_print.c

src/output_print.h

src/output_state.c

src/output_state.h

src/page.c

src/page.h

src/pcm_buffer.h

src/pcm_convert.c

src/pcm_convert.h

src/pcm_format.c

src/pcm_format.h

src/pcm_mix.c

src/pcm_mix.h

src/pcm_resample_internal.h

src/pcm_volume.c

src/pcm_volume.h

src/playlist_control.c

src/playlist_edit.c

src/playlist_global.c

src/playlist_internal.h

src/playlist_print.c

src/playlist_print.h

src/playlist_state.c

src/playlist_state.h

src/poison.h

src/queue.c

src/queue.h

src/queue_print.c

src/queue_print.h

src/queue_save.c

src/queue_save.h

src/riff.c

src/riff.h

src/socket_util.c

src/socket_util.h

src/song_sticker.c

src/song_sticker.h

src/sticker.c

src/sticker.h

src/sticker_print.c

src/sticker_print.h

src/tag_ape.c

src/tag_ape.h

src/uri.c

src/uri.h

src/zeroconf-avahi.c

src/zeroconf-bonjour.c

src/zeroconf-internal.h

test

test/read_conf.c

test/read_mixer.c

test/read_tags.c

test/run_decoder.c

test/run_encoder.c

test/run_input.c

test/run_output.c

test/software_volume.c

files removed:
TODO

doc/Makefile.am

doc/Makefile.in

m4/acx_pthread.m4

m4/codeset.m4

scripts/makerpm.sh

scripts/mpd.spec

src/Makefile.am

src/Makefile.in

src/audioOutput.c

src/audioOutput.h

src/condition.c

src/condition.h

src/decoder/aac_plugin.c

src/decoder/mod_plugin.c

src/decoder/mp3_plugin.c

src/decoder/mp4_plugin.c

src/decoder/mpc_plugin.c

src/decoder/oggvorbis_plugin.c

src/dlist.h

src/input_curl.c

src/input_curl.h

src/input_file.c

src/input_file.h

src/ioops.c

src/ioops.h

src/list.c

src/list.h

src/main_notify.c

src/main_notify.h

src/os_compat.h

src/output/shout_mp3.c

src/output/shout_ogg.c

src/output/shout_plugin.h

src/output_api.c

src/pcm_utils.c

src/playerData.c

src/playerData.h

src/signal_check.c

src/signal_check.h

files modified:
AUTHORS

INSTALL

Makefile.am

Makefile.in

NEWS

aclocal.m4

config.guess

config.h.in

config.sub

configure

configure.ac

debian/changelog

debian/control

debian/mpd.conf

debian/mpd.init.d

debian/rules

doc/mpd.1

doc/mpd.conf.5

doc/mpdconf.example

doc/protocol.xml

m4/lame.m4

m4/libOggFLAC.m4

m4/mpd_check_cflag.m4

scripts/test.sh

src/ack.h

src/audio.c

src/audio.h

src/audio_format.h

src/buffer2array.c

src/buffer2array.h

src/client.c

src/client.h

src/command.c

src/command.h

src/compress.c

src/compress.h

src/conf.c

src/conf.h

src/crossfade.c

src/crossfade.h

src/database.c

src/database.h

src/dbUtils.c

src/dbUtils.h

src/decoder/_flac_common.c

src/decoder/_flac_common.h

src/decoder/_ogg_common.c

src/decoder/_ogg_common.h

src/decoder/audiofile_plugin.c

src/decoder/ffmpeg_plugin.c

src/decoder/flac_plugin.c

src/decoder/oggflac_plugin.c

src/decoder/wavpack_plugin.c

src/decoder_api.c

src/decoder_api.h

src/decoder_control.c

src/decoder_control.h

src/decoder_internal.h

src/decoder_list.c

src/decoder_list.h

src/decoder_thread.c

src/decoder_thread.h

src/directory.c

src/directory.h

src/directory_print.c

src/directory_print.h

src/directory_save.c

src/directory_save.h

src/dirvec.c

src/dirvec.h

src/gcc.h

src/idle.c

src/idle.h

src/input_stream.c

src/input_stream.h

src/listen.c

src/listen.h

src/locate.c

src/locate.h

src/log.c

src/log.h

src/ls.c

src/ls.h

src/main.c

src/mapper.c

src/mapper.h

src/normalize.c

src/normalize.h

src/notify.c

src/notify.h

src/output/alsa_plugin.c

src/output/ao_plugin.c

src/output/fifo_plugin.c

src/output/jack_plugin.c

src/output/mvp_plugin.c

src/output/null_plugin.c

src/output/oss_plugin.c

src/output/osx_plugin.c

src/output/pulse_plugin.c

src/output/shout_plugin.c

src/output_api.h

src/output_control.c

src/output_control.h

src/output_init.c

src/output_internal.h

src/output_list.c

src/output_list.h

src/output_thread.c

src/output_thread.h

src/path.c

src/path.h

src/pcm_channels.c

src/pcm_channels.h

src/pcm_dither.c

src/pcm_dither.h

src/pcm_prng.h

src/pcm_resample.c

src/pcm_resample.h

src/pcm_resample_fallback.c

src/pcm_resample_libsamplerate.c

src/pcm_utils.h

src/permission.c

src/permission.h

src/pipe.c

src/pipe.h

src/player_control.c

src/player_control.h

src/player_thread.c

src/player_thread.h

src/playlist.c

src/playlist.h

src/playlist_save.c

src/playlist_save.h

src/replay_gain.c

src/replay_gain.h

src/sig_handlers.c

src/sig_handlers.h

src/song.c

src/song.h

src/song_print.c

src/song_print.h

src/song_save.c

src/song_save.h

src/songvec.c

src/songvec.h

src/state_file.c

src/state_file.h

src/stats.c

src/stats.h

src/stored_playlist.c

src/stored_playlist.h

src/strset.c

src/strset.h

src/tag.c

src/tag.h

src/tag_id3.c

src/tag_id3.h

src/tag_internal.h

src/tag_pool.c

src/tag_pool.h

src/tag_print.c

src/tag_print.h

src/tag_save.c

src/tag_save.h

src/timer.c

src/timer.h

src/update.c

src/update.h

src/utils.c

src/utils.h

src/volume.c

src/volume.h

src/zeroconf.c

src/zeroconf.h

Show diffs side-by-side

added added

removed removed

src/log.c

/* the Music Player Daemon (MPD)

* This project's homepage is: http://www.musicpd.org

* http://www.musicpd.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

* 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

* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

* You should have received a copy of the GNU General Public License along

* with this program; if not, write to the Free Software Foundation, Inc.,

* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

#include "log.h"

#include "conf.h"

#include "utils.h"

#include "config.h"

#include <assert.h>

#include <sys/types.h>

#include <time.h>

#include <unistd.h>

#include <errno.h>

#include <pthread.h>

#include <glib.h>

#ifdef HAVE_SYSLOG

#include <syslog.h>

#endif

#undef G_LOG_DOMAIN

#define G_LOG_DOMAIN "log"

#define LOG_LEVEL_SECURE G_LOG_LEVEL_INFO

#define LOG_DATE_BUF_SIZE 16

#define LOG_DATE_LEN (LOG_DATE_BUF_SIZE - 1)

static unsigned int log_threshold = G_LOG_LEVEL_MESSAGE;

static GLogLevelFlags log_threshold = G_LOG_LEVEL_MESSAGE;

static const char *log_charset;

static bool stdout_mode = true;

static int out_fd = -1;

static int err_fd = -1;

static int out_fd;

static const char *out_filename;

static const char *err_filename;

static void redirect_logs(void)

static void redirect_logs(int fd)

{

assert(out_fd >= 0);

assert(err_fd >= 0);

if (dup2(out_fd, STDOUT_FILENO) < 0)

FATAL("problems dup2 stdout : %s\n", strerror(errno));

if (dup2(err_fd, STDERR_FILENO) < 0)

FATAL("problems dup2 stderr : %s\n", strerror(errno));

assert(fd >= 0);

if (dup2(fd, STDOUT_FILENO) < 0)

g_error("problems dup2 stdout : %s\n", strerror(errno));

if (dup2(fd, STDERR_FILENO) < 0)

g_error("problems dup2 stderr : %s\n", strerror(errno));

}

static const char *log_date(void)

}

static void

mpd_log_func(const gchar *log_domain,

G_GNUC_UNUSED GLogLevelFlags log_level,

const gchar *message, G_GNUC_UNUSED gpointer user_data)

file_log_func(const gchar *log_domain,

GLogLevelFlags log_level,

const gchar *message, G_GNUC_UNUSED gpointer user_data)

{

FILE *file = log_level <= G_LOG_LEVEL_WARNING

? stderr : stdout;

char *converted;

if (log_level > (int)log_threshold)

if (log_level > log_threshold)

return;

100

if (log_charset != NULL) {

105

109

if (log_domain == NULL)

106

110

log_domain = "";

107

111

108

fprintf(file, "%s%s%s%.*s\n",

112

fprintf(stderr, "%s%s%s%.*s\n",

109

113

stdout_mode ? "" : log_date(),

110

114

log_domain, *log_domain == 0 ? "" : ": ",

111

115

chomp_length(message), message);

113

117

g_free(converted);

114

118

}

115

119

116

void initLog(bool verbose)

117

{

118

ConfigParam *param;

120

static void

121

log_init_stdout(void)

122

{

123

g_log_set_default_handler(file_log_func, NULL);

124

}

125

126

static int

127

open_log_file(void)

128

{

129

assert(out_filename != NULL);

130

131

return open(out_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);

132

}

133

134

static void

135

log_init_file(const char *path, unsigned line)

136

{

137

out_filename = path;

138

out_fd = open_log_file();

139

if (out_fd < 0)

140

g_error("problem opening log file \"%s\" (config line %u) for "

141

"writing\n", path, line);

142

143

g_log_set_default_handler(file_log_func, NULL);

144

}

145

146

#ifdef HAVE_SYSLOG

147

148

static int

149

glib_to_syslog_level(GLogLevelFlags log_level)

150

{

151

switch (log_level & G_LOG_LEVEL_MASK) {

152

case G_LOG_LEVEL_ERROR:

153

case G_LOG_LEVEL_CRITICAL:

154

return LOG_ERR;

155

156

case G_LOG_LEVEL_WARNING:

157

return LOG_WARNING;

158

159

case G_LOG_LEVEL_MESSAGE:

160

return LOG_NOTICE;

161

162

case G_LOG_LEVEL_INFO:

163

return LOG_INFO;

164

165

case G_LOG_LEVEL_DEBUG:

166

return LOG_DEBUG;

167

168

default:

169

return LOG_NOTICE;

170

}

171

}

172

173

static void

174

syslog_log_func(const gchar *log_domain,

175

GLogLevelFlags log_level, const gchar *message,

176

G_GNUC_UNUSED gpointer user_data)

177

{

178

if (stdout_mode) {

179

/* fall back to the file log function during

180

startup */

181

file_log_func(log_domain, log_level,

182

message, user_data);

183

return;

184

}

185

186

if (log_level > log_threshold)

187

return;

188

189

if (log_domain == NULL)

190

log_domain = "";

191

192

syslog(glib_to_syslog_level(log_level), "%s%s%.*s",

193

log_domain, *log_domain == 0 ? "" : ": ",

194

chomp_length(message), message);

195

}

196

197

static void

198

log_init_syslog(void)

199

{

200

assert(out_filename == NULL);

201

202

openlog(PACKAGE, 0, LOG_DAEMON);

203

g_log_set_default_handler(syslog_log_func, NULL);

204

}

205

206

#endif

207

208

static inline GLogLevelFlags

209

parse_log_level(const char *value, unsigned line)

210

{

211

if (0 == strcmp(value, "default"))

212

return G_LOG_LEVEL_MESSAGE;

213

if (0 == strcmp(value, "secure"))

214

return LOG_LEVEL_SECURE;

215

else if (0 == strcmp(value, "verbose"))

216

return G_LOG_LEVEL_DEBUG;

217

else {

218

g_error("unknown log level \"%s\" at line %u\n",

219

value, line);

220

return G_LOG_LEVEL_MESSAGE;

221

}

222

}

223

224

void

225

log_early_init(bool verbose)

226

{

227

if (verbose)

228

log_threshold = G_LOG_LEVEL_DEBUG;

229

230

log_init_stdout();

231

}

232

233

void log_init(bool verbose, bool use_stdout)

234

{

235

const struct config_param *param;

119

236

120

237

g_get_charset(&log_charset);

121

238

122

g_log_set_default_handler(mpd_log_func, NULL);

123

124

/* unbuffer stdout, stderr is unbuffered by default, leave it */

125

setvbuf(stdout, (char *)NULL, _IONBF, 0);

126

127

if (verbose) {

128

log_threshold = G_LOG_LEVEL_DEBUG;

129

return;

130

}

131

if (!(param = getConfigParam(CONF_LOG_LEVEL)))

132

return;

133

if (0 == strcmp(param->value, "default")) {

134

log_threshold = G_LOG_LEVEL_MESSAGE;

135

} else if (0 == strcmp(param->value, "secure")) {

136

log_threshold = LOG_LEVEL_SECURE;

137

} else if (0 == strcmp(param->value, "verbose")) {

138

log_threshold = G_LOG_LEVEL_DEBUG;

239

if (verbose)

240

log_threshold = G_LOG_LEVEL_DEBUG;

241

else if ((param = config_get_param(CONF_LOG_LEVEL)) != NULL)

242

log_threshold = parse_log_level(param->value, param->line);

243

244

if (use_stdout) {

245

log_init_stdout();

139

246

} else {

140

FATAL("unknown log level \"%s\" at line %i\n",

141

param->value, param->line);

247

param = config_get_param(CONF_LOG_FILE);

248

if (param == NULL) {

249

#ifdef HAVE_SYSLOG

250

/* no configuration: default to syslog (if

251

available) */

252

log_init_syslog();

253

#else

254

g_error("config parameter \"%s\" not found\n",

255

CONF_LOG_FILE);

256

#endif

257

#ifdef HAVE_SYSLOG

258

} else if (strcmp(param->value, "syslog") == 0) {

259

log_init_syslog();

260

#endif

261

} else {

262

const char *path = config_get_path(CONF_LOG_FILE);

263

assert(path != NULL);

264

265

log_init_file(path, param->line);

266

}

142

267

}

143

268

}

144

269

145

void open_log_files(bool use_stdout)

146

{

147

mode_t prev;

148

ConfigParam *param;

149

150

if (use_stdout)

151

return;

152

153

prev = umask(0066);

154

param = parseConfigFilePath(CONF_LOG_FILE, 1);

155

out_filename = param->value;

156

out_fd = open(out_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);

157

if (out_fd < 0)

158

FATAL("problem opening log file \"%s\" (config line %i) for "

159

"writing\n", param->value, param->line);

160

161

param = parseConfigFilePath(CONF_ERROR_FILE, 1);

162

err_filename = param->value;

163

err_fd = open(err_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);

164

if (err_fd < 0)

165

FATAL("problem opening error file \"%s\" (config line %i) for "

166

"writing\n", param->value, param->line);

167

168

umask(prev);

169

}

170

171

270

void setup_log_output(bool use_stdout)

172

271

{

173

272

fflush(NULL);

174

273

if (!use_stdout) {

175

redirect_logs();

274

if (out_filename != NULL) {

275

redirect_logs(out_fd);

276

close(out_fd);

277

}

278

176

279

stdout_mode = false;

177

280

log_charset = NULL;

178

281

}

179

282

}

180

283

181

#define log_func(func,level) \

182

G_GNUC_PRINTF(1, 2) void func(const char *fmt, ...) \

183

{ \

184

if (level <= (int)log_threshold) { \

185

va_list args; \

186

va_start(args, fmt); \

187

g_logv(NULL, level, fmt, args); \

188

va_end(args); \

189

} \

190

}

191

192

log_func(ERROR, G_LOG_LEVEL_WARNING)

193

log_func(WARNING, G_LOG_LEVEL_WARNING)

194

log_func(LOG, G_LOG_LEVEL_MESSAGE)

195

log_func(SECURE, LOG_LEVEL_SECURE)

196

log_func(DEBUG, G_LOG_LEVEL_DEBUG)

197

198

#undef log_func

199

200

G_GNUC_PRINTF(1, 2) G_GNUC_NORETURN void FATAL(const char *fmt, ...)

201

{

202

va_list args;

203

va_start(args, fmt);

204

g_logv(NULL, G_LOG_LEVEL_ERROR, fmt, args);

205

va_end(args);

206

exit(EXIT_FAILURE);

207

}

208

209

284

int cycle_log_files(void)

210

285

{

211

mode_t prev;

286

int fd;

212

287

213

if (stdout_mode)

288

if (stdout_mode || out_filename == NULL)

214

289

return 0;

215

290

assert(out_filename);

216

assert(err_filename);

217

291

218

DEBUG("Cycling log files...\n");

292

g_debug("Cycling log files...\n");

219

293

close_log_files();

220

294

221

prev = umask(0066);

222

223

out_fd = open(out_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);

224

if (out_fd < 0) {

225

ERROR("error re-opening log file: %s\n", out_filename);

226

return -1;

227

}

228

229

err_fd = open(err_filename, O_CREAT | O_WRONLY | O_APPEND, 0666);

230

if (err_fd < 0) {

231

ERROR("error re-opening error file: %s\n", err_filename);

232

return -1;

233

}

234

235

umask(prev);

236

237

redirect_logs();

238

DEBUG("Done cycling log files\n");

295

fd = open_log_file();

296

if (fd < 0) {

297

g_warning("error re-opening log file: %s\n", out_filename);

298

return -1;

299

}

300

301

redirect_logs(fd);

302

g_debug("Done cycling log files\n");

239

303

return 0;

240

304

}

241

305

243

307

{

244

308

if (stdout_mode)

245

309

return;

246

assert(out_fd >= 0);

247

assert(err_fd >= 0);

248

close(out_fd);

249

close(err_fd);

310

311

#ifdef HAVE_SYSLOG

312

if (out_filename == NULL)

313

closelog();

314

#endif

250

315

}

251

316

Older »