maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GUAC-911: Use guacd namespace. Replace log_prefix with macro. Use same log name for all.

Browse Source
This commit is contained in:
Michael Jumper 2014-11-09 17:09:35 -08:00
parent c3f98b388a
commit 4b92233084
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/guacd/daemon.c
View File

@ -389,12 +389,9 @@ int main(int argc, char* argv[]) {
if (config == NULL || guacd_conf_parse_args(config, argc, argv)) if (config == NULL || guacd_conf_parse_args(config, argc, argv))
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
/* Set up logging prefix */
strncpy(log_prefix, basename(argv[0]), sizeof(log_prefix));
/* Init logging as early as possible */ /* Init logging as early as possible */
log_level = config->max_log_level; guacd_log_level = config->max_log_level;
openlog("guacd", LOG_PID, LOG_DAEMON); openlog(GUACD_LOG_NAME, LOG_PID, LOG_DAEMON);
/* Log start */ /* Log start */
guacd_log(GUAC_LOG_INFO, "Guacamole proxy daemon (guacd) version " VERSION); guacd_log(GUAC_LOG_INFO, "Guacamole proxy daemon (guacd) version " VERSION);

11
src/guacd/log.c
View File

@ -31,10 +31,7 @@
#include <syslog.h> #include <syslog.h>
#include <unistd.h> #include <unistd.h>
/* Log prefix, defaulting to "guacd" */ int guacd_log_level = GUAC_LOG_INFO;
char log_prefix[64] = "guacd";
int log_level = GUAC_LOG_INFO;
void vguacd_log(guac_client_log_level level, const char* format, void vguacd_log(guac_client_log_level level, const char* format,
va_list args) { va_list args) {
@ -45,7 +42,7 @@ void vguacd_log(guac_client_log_level level, const char* format,
char message[2048]; char message[2048];
/* Don't bother if the log level is too high */ /* Don't bother if the log level is too high */
if (level > log_level) if (level > guacd_log_level)
return; return;
/* Copy log message into buffer */ /* Copy log message into buffer */
@ -90,8 +87,8 @@ void vguacd_log(guac_client_log_level level, const char* format,
/* Log to STDERR, if high enough log level */ /* Log to STDERR, if high enough log level */
if (priority <= LOG_INFO) if (priority <= LOG_INFO)
fprintf(stderr, "%s[%i]: %s: %s\n", log_prefix, getpid(), fprintf(stderr, GUACD_LOG_NAME "[%i]: %s: %s\n",
priority_name, message); getpid(), priority_name, message);
} }

4
src/guacd/log.h
View File

@ -32,12 +32,12 @@
* The maximum level at which to log messages. All other messages will be * The maximum level at which to log messages. All other messages will be
* dropped. * dropped.
*/ */
extern int log_level; extern int guacd_log_level;
/** /**
* The string to prepend to all log messages. * The string to prepend to all log messages.
*/ */
extern char log_prefix[64]; #define GUACD_LOG_NAME "guacd"
/** /**
* Writes a message to guacd's logs. This function takes a format and va_list, * Writes a message to guacd's logs. This function takes a format and va_list,