shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

dmeventd: support logging on stdout

Browse Source 
Add new supported option '-l' log to stdout/stderr.

It has to be paired with '-f' (foreground run).
This commit is contained in:
Zdenek Kabelac 2015-10-13 15:14:11 +02:00
parent 903e9af1b2
commit 8b9533f38f
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
daemons/dmeventd/dmeventd.c
View File

@ -104,7 +104,8 @@ static pthread_mutex_t _global_mutex;
#define THREAD_STACK_SIZE (300*1024) #define THREAD_STACK_SIZE (300*1024)
int dmeventd_debug = 0; static int _debug_level = 0;
static int _use_syslog = 1;
static int _systemd_activation = 0; static int _systemd_activation = 0;
static int _foreground = 0; static int _foreground = 0;
static int _restart = 0; static int _restart = 0;
@ -2051,10 +2052,11 @@ bad:
static void _usage(char *prog, FILE *file) static void _usage(char *prog, FILE *file)
{ {
fprintf(file, "Usage:\n" fprintf(file, "Usage:\n"
"%s [-d [-d [-d]]] [-f] [-h] [-R] [-V] [-?]\n\n" "%s [-d [-d [-d]]] [-f] [-h] [-l] [-R] [-V] [-?]\n\n"
" -d Log debug messages to syslog (-d, -dd, -ddd)\n" " -d Log debug messages to syslog (-d, -dd, -ddd)\n"
" -f Don't fork, run in the foreground\n" " -f Don't fork, run in the foreground\n"
" -h Show this help information\n" " -h Show this help information\n"
" -l Log to stdout,stderr instead of syslog\n"
" -? Show this help information on stderr\n" " -? Show this help information on stderr\n"
" -R Restart dmeventd\n" " -R Restart dmeventd\n"
" -V Show version of dmeventd\n\n", prog); " -V Show version of dmeventd\n\n", prog);
@ -2075,7 +2077,7 @@ int main(int argc, char *argv[])
opterr = 0; opterr = 0;
optind = 0; optind = 0;
while ((opt = getopt(argc, argv, "?fhVdR")) != EOF) { while ((opt = getopt(argc, argv, "?fhVdlR")) != EOF) {
switch (opt) { switch (opt) {
case 'h': case 'h':
_usage(argv[0], stdout); _usage(argv[0], stdout);
@ -2090,7 +2092,10 @@ int main(int argc, char *argv[])
_foreground++; _foreground++;
break; break;
case 'd': case 'd':
dmeventd_debug++; _debug_level++;
break;
case 'l':
_use_syslog = 0;
break; break;
case 'V': case 'V':
printf("dmeventd version: %s\n", DM_LIB_VERSION); printf("dmeventd version: %s\n", DM_LIB_VERSION);
@ -2098,6 +2103,10 @@ int main(int argc, char *argv[])
} }
} }
if (!_foreground && !_use_syslog) {
printf("WARNING: Ignoring logging to stdout, needs options -f\n");
_use_syslog = 1;
}
/* /*
* Switch to C locale to avoid reading large locale-archive file * Switch to C locale to avoid reading large locale-archive file
* used by some glibc (on some distributions it takes over 100MB). * used by some glibc (on some distributions it takes over 100MB).
@ -2116,8 +2125,10 @@ int main(int argc, char *argv[])
if (!_foreground) if (!_foreground)
_daemonize(); _daemonize();
openlog("dmeventd", LOG_PID, LOG_DAEMON); if (_use_syslog)
openlog("dmeventd", LOG_PID, LOG_DAEMON);
dm_event_log_set(_debug_level, _use_syslog);
dm_log_init(_dmeventd_log); dm_log_init(_dmeventd_log);
(void) dm_prepare_selinux_context(DMEVENTD_PIDFILE, S_IFREG); (void) dm_prepare_selinux_context(DMEVENTD_PIDFILE, S_IFREG);
@ -2180,12 +2191,20 @@ int main(int argc, char *argv[])
_cleanup_unused_threads(); _cleanup_unused_threads();
} }
_exit_dm_lib();
pthread_mutex_destroy(&_global_mutex); pthread_mutex_destroy(&_global_mutex);
log_notice("dmeventd shutting down."); log_notice("dmeventd shutting down.");
closelog();
if (close(fifos.client))
log_sys_error("client close", fifos.client_path);
if (close(fifos.server))
log_sys_error("server close", fifos.server_path);
if (_use_syslog)
closelog();
_exit_dm_lib();
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }

7
man/dmeventd.8.in
View File

@ -12,6 +12,7 @@ dmeventd \(em Device-mapper event daemon
.RB [ \-d ]]] .RB [ \-d ]]]
.RB [ \-f ] .RB [ \-f ]
.RB [ \-h ] .RB [ \-h ]
.RB [ \-l ]
.RB [ \-R ] .RB [ \-R ]
.RB [ \-V ] .RB [ \-V ]
.RB [ \-? ] .RB [ \-? ]
@ -81,6 +82,12 @@ Don't fork, run in the foreground.
Show help information. Show help information.
. .
.HP .HP
.BR \-l
.br
Log through stdout and stderr instead of syslog.
This option works only with option \-f, otherwise it is ignored.
.
.HP
.BR \-? .BR \-?
.br .br
Show help information on stderr. Show help information on stderr.