diff options
| author | Petr Rockai <prockai@redhat.com> | 2011-03-02 12:49:13 +0000 |
|---|---|---|
| committer | Petr Rockai <prockai@redhat.com> | 2011-03-02 12:49:13 +0000 |
| commit | 61394ca4aa464bf35df955d3107a6cb37101d828 (patch) | |
| tree | 3d9f15674c46ce52225f8835d22bb054b0a95002 /daemons/dmeventd | |
| parent | 15b92155346021036149cc270d36f576abe6c4b0 (diff) | |
| download | lvm2-61394ca4aa464bf35df955d3107a6cb37101d828.tar.gz lvm2-61394ca4aa464bf35df955d3107a6cb37101d828.tar.xz lvm2-61394ca4aa464bf35df955d3107a6cb37101d828.zip | |
As requested in BZ 454618:
- dmeventd -R will continue to start up even if no dmeventd is currently
running + a test for this behaviour
- add -R to dmeventd manpage
Diffstat (limited to 'daemons/dmeventd')
| -rw-r--r-- | daemons/dmeventd/dmeventd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c index 32c69da5..28e492ef 100644 --- a/daemons/dmeventd/dmeventd.c +++ b/daemons/dmeventd/dmeventd.c @@ -1708,13 +1708,14 @@ static void restart(void) /* Get the list of registrations from the running daemon. */ if (!init_fifos(&fifos)) { - fprintf(stderr, "Could not initiate communication with existing dmeventd.\n"); - exit(EXIT_FAILURE); + fprintf(stderr, "WARNING: Could not initiate communication with existing dmeventd.\n"); + return; } if (daemon_talk(&fifos, &msg, DM_EVENT_CMD_HELLO, NULL, NULL, 0, 0)) { - fprintf(stderr, "Could not communicate with existing dmeventd.\n"); - exit(EXIT_FAILURE); + fprintf(stderr, "WARNING: Could not communicate with existing dmeventd.\n"); + fini_fifos(&fifos); + return; } if (daemon_talk(&fifos, &msg, DM_EVENT_CMD_GET_STATUS, "-", "-", 0, 0)) { |