diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2019-06-12 16:13:21 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2019-06-12 17:15:35 +0200 |
| commit | 9106a750cd76d4a76c7a60294ce3a43eede166c9 (patch) | |
| tree | 507177651bf4654e714665a6f2e3ab1ed330e1cf /sysdep/unix | |
| parent | 8a2cbb88d1657b4aee366605cb3d8ffcc5d3f90a (diff) | |
Add CLI command to test reconfiguration status
Based on patch from Kenth Eriksson <kenth.eriksson@infinera.com>.
Diffstat (limited to 'sysdep/unix')
| -rw-r--r-- | sysdep/unix/config.Y | 5 | ||||
| -rw-r--r-- | sysdep/unix/main.c | 22 | ||||
| -rw-r--r-- | sysdep/unix/unix.h | 1 |
3 files changed, 27 insertions, 1 deletions
diff --git a/sysdep/unix/config.Y b/sysdep/unix/config.Y index e7ecd735..2895a69e 100644 --- a/sysdep/unix/config.Y +++ b/sysdep/unix/config.Y @@ -18,7 +18,7 @@ static struct log_config *this_log; CF_DECLS CF_KEYWORDS(LOG, SYSLOG, ALL, DEBUG, TRACE, INFO, REMOTE, WARNING, ERROR, AUTH, FATAL, BUG, STDERR, SOFT) -CF_KEYWORDS(NAME, CONFIRM, UNDO, CHECK, TIMEOUT, DEBUG, LATENCY, LIMIT, WATCHDOG, WARNING) +CF_KEYWORDS(NAME, CONFIRM, UNDO, CHECK, TIMEOUT, DEBUG, LATENCY, LIMIT, WATCHDOG, WARNING, STATUS) %type <i> log_mask log_mask_list log_cat cfg_timeout %type <t> cfg_name @@ -124,6 +124,9 @@ CF_CLI(CONFIGURE CONFIRM,,, [[Confirm last configuration change - deactivate und CF_CLI(CONFIGURE UNDO,,, [[Undo last configuration change]]) { cmd_reconfig_undo(); } ; +CF_CLI(CONFIGURE STATUS,,, [[Show configuration status]]) +{ cmd_reconfig_status(); } ; + CF_CLI(CONFIGURE CHECK, cfg_name, [\"<file>\"], [[Parse configuration and check its validity]]) { cmd_check_config($3); } ; diff --git a/sysdep/unix/main.c b/sysdep/unix/main.c index 921115b1..c381b44f 100644 --- a/sysdep/unix/main.c +++ b/sysdep/unix/main.c @@ -339,6 +339,28 @@ cmd_reconfig_undo(void) cmd_reconfig_msg(r); } +void +cmd_reconfig_status(void) +{ + int s = config_status(); + btime t = config_timer_status(); + + switch (s) + { + case CONF_DONE: cli_msg(-3, "Daemon is up and running"); break; + case CONF_PROGRESS: cli_msg(-4, "Reconfiguration in progress"); break; + case CONF_QUEUED: cli_msg(-5, "Reconfiguration in progress, next one enqueued"); break; + case CONF_SHUTDOWN: cli_msg(-6, "Shutdown in progress"); break; + default: break; + } + + if (t >= 0) + cli_msg(-22, "Configuration unconfirmed, undo in %t s", t); + + cli_msg(0, ""); +} + + /* * Command-Line Interface */ diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h index 0e1e98c0..d5ce8ff9 100644 --- a/sysdep/unix/unix.h +++ b/sysdep/unix/unix.h @@ -26,6 +26,7 @@ void cmd_check_config(char *name); void cmd_reconfig(char *name, int type, uint timeout); void cmd_reconfig_confirm(void); void cmd_reconfig_undo(void); +void cmd_reconfig_status(void); void cmd_shutdown(void); #define UNIX_DEFAULT_CONFIGURE_TIMEOUT 300 |