Merge pull request #19792 from keszybz/more-logging-stuff

More logging tweaks
This commit is contained in:
Yu Watanabe
2021-06-03 03:36:28 +09:00
committed by GitHub
13 changed files with 123 additions and 91 deletions
+4 -4
View File
@@ -221,11 +221,11 @@ DEFINE_PRIVATE_STRING_TABLE_LOOKUP_TO_STRING(varlink_state, VarlinkState);
log_debug("%s: " fmt, varlink_server_description(s), ##__VA_ARGS__)
static inline const char *varlink_description(Varlink *v) {
return strna(v ? v->description : NULL);
return (v ? v->description : NULL) ?: "varlink";
}
static inline const char *varlink_server_description(VarlinkServer *s) {
return strna(s ? s->description : NULL);
return (s ? s->description : NULL) ?: "varlink";
}
static void varlink_set_state(Varlink *v, VarlinkState state) {
@@ -233,10 +233,10 @@ static void varlink_set_state(Varlink *v, VarlinkState state) {
assert(state >= 0 && state < _VARLINK_STATE_MAX);
if (v->state < 0)
varlink_log(v, "varlink: setting state %s",
varlink_log(v, "Setting state %s",
varlink_state_to_string(state));
else
varlink_log(v, "varlink: changing state %s → %s",
varlink_log(v, "Changing state %s → %s",
varlink_state_to_string(v->state),
varlink_state_to_string(state));