picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core/snapshot: log info when snapshots are created and removed 

Snapshot mechanism is not used very much, but snapshot creation/destruction
should be at least as verbose as normal unit starting/stopping.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-06-22 14:20:08 -04:00
parent 04ef5b03f6
commit 6f8bd5c94e
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -214,8 +214,6 @@ Features:
- add 'set -e' to scripts in test/
- make stuff in test/ work with separate output dir
* systemctl delete x.snapshot leaves no trace in logs (at least at default level).
* seems that when we follow symlinks to units we prefer the symlink
destination path over /etc and /usr. We should not do that. Instead
/etc should always override /run+/usr and also any symlink

19
src/core/snapshot.c
View File

@ -51,10 +51,11 @@ static void snapshot_set_state(Snapshot *s, SnapshotState state) {
s->state = state;
if (state != old_state)
log_debug("%s changed %s -> %s",
UNIT(s)->id,
snapshot_state_to_string(old_state),
snapshot_state_to_string(state));
log_debug_unit(UNIT(s)->id,
"%s changed %s -> %s",
UNIT(s)->id,
snapshot_state_to_string(old_state),
snapshot_state_to_string(state));
unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], true);
}
@ -154,7 +155,7 @@ static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
state = snapshot_state_from_string(value);
if (state < 0)
log_debug("Failed to parse state value %s", value);
log_debug_unit(u->id, "Failed to parse state value %s", value);
else
s->deserialized_state = state;
@ -162,7 +163,7 @@ static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
r = parse_boolean(value);
if (r < 0)
log_debug("Failed to parse cleanup value %s", value);
log_debug_unit(u->id, "Failed to parse cleanup value %s", value);
else
s->cleanup = r;
@ -172,7 +173,7 @@ static int snapshot_deserialize_item(Unit *u, const char *key, const char *value
if (r < 0)
return r;
} else
log_debug("Unknown serialization key '%s'", key);
log_debug_unit(u->id, "Unknown serialization key '%s'", key);
return 0;
}
@ -257,6 +258,8 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, sd_bus_error *e,
SNAPSHOT(u)->cleanup = cleanup;
*_s = SNAPSHOT(u);
log_info_unit(u->id, "Created snapshot %s.", u->id);
return 0;
fail:
@ -269,6 +272,8 @@ fail:
void snapshot_remove(Snapshot *s) {
assert(s);
log_info_unit(UNIT(s)->id, "Removing snapshot %s.", UNIT(s)->id);
unit_add_to_cleanup_queue(UNIT(s));
}