github
/
mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for internal logging not printing.

Browse Source
pull/1586/head
Roger A. Light 6 years ago
parent 8f1c8cba59
commit 50735afb5b
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File

4
lib/mosquitto.h
Unescape Escape View File

@ -62,8 +62,8 @@ extern "C" {
#define MOSQ_LOG_SUBSCRIBE (1<<5) #define MOSQ_LOG_SUBSCRIBE (1<<5)
#define MOSQ_LOG_UNSUBSCRIBE (1<<6) #define MOSQ_LOG_UNSUBSCRIBE (1<<6)
#define MOSQ_LOG_WEBSOCKETS (1<<7) #define MOSQ_LOG_WEBSOCKETS (1<<7)
#define MOSQ_LOG_INTERNAL 0x80000000 #define MOSQ_LOG_INTERNAL 0x80000000U
#define MOSQ_LOG_ALL 0x7FFFFFFF #define MOSQ_LOG_ALL 0xFFFFFFFFU
/* Error values */ /* Error values */
enum mosq_err_t { enum mosq_err_t {

6
src/conf.c
Unescape Escape View File

@ -207,7 +207,7 @@ static void config__init_reload(struct mosquitto_db *db, struct mosquitto__confi
config->log_facility = LOG_DAEMON; config->log_facility = LOG_DAEMON;
config->log_dest = MQTT3_LOG_STDERR; config->log_dest = MQTT3_LOG_STDERR;
if(db->verbose){ if(db->verbose){
config->log_type = INT_MAX; config->log_type = UINT_MAX;
}else{ }else{
config->log_type = MOSQ_LOG_ERR | MOSQ_LOG_WARNING | MOSQ_LOG_NOTICE | MOSQ_LOG_INFO; config->log_type = MOSQ_LOG_ERR | MOSQ_LOG_WARNING | MOSQ_LOG_NOTICE | MOSQ_LOG_INFO;
} }
@ -543,7 +543,7 @@ int config__parse_args(struct mosquitto_db *db, struct mosquitto__config *config
} }
} }
if(db->verbose){ if(db->verbose){
config->log_type = INT_MAX; config->log_type = UINT_MAX;
} }
return config__check(config); return config__check(config);
} }
@ -777,7 +777,7 @@ int config__read(struct mosquitto_db *db, struct mosquitto__config *config, bool
config->log_dest = cr.log_dest; config->log_dest = cr.log_dest;
} }
if(db->verbose){ if(db->verbose){
config->log_type = INT_MAX; config->log_type = UINT_MAX;
}else if(cr.log_type_set){ }else if(cr.log_type_set){
config->log_type = cr.log_type; config->log_type = cr.log_type;
} }

2
src/mosquitto_broker_internal.h
Unescape Escape View File

@ -283,7 +283,7 @@ struct mosquitto__config {
int listener_count; int listener_count;
int log_dest; int log_dest;
int log_facility; int log_facility;
int log_type; unsigned int log_type;
bool log_timestamp; bool log_timestamp;
char *log_timestamp_format; char *log_timestamp_format;
char *log_file; char *log_file;

Write Preview
Loading…
Cancel
Save