Teach `upsdrvctl` to list device config names and show run-time `status`, and to optionally hide the start-up banner #2568

jimklimov · 2024-07-30T14:19:14Z

Also update some docs for recently added tweaking envvars, and use PACKAGE_URL value in networked queries (upsd GET and GET VAR <upsname> server.info).

Touches on several issues/PRs:

UPDATE: With status (also in upsdrvsvcctl, albeit rudimentary -- just calling upsdrvctl but not drilling into service unit info) it actually...
Closes: #2567

Signed-off-by: Jim Klimov <[email protected]>

…le" assignments Signed-off-by: Jim Klimov <[email protected]>

…g logs [networkupstools#2567] ...and avoid a potential argv array overflow (or at least useless NULL reporting) along the way Signed-off-by: Jim Klimov <[email protected]>

…issed before [networkupstools#2118] Signed-off-by: Jim Klimov <[email protected]>

…UPSNOTIFY missed before [networkupstools#2136] Signed-off-by: Jim Klimov <[email protected]>

…orkupstools#1662] Signed-off-by: Jim Klimov <[email protected]>

…led()` common method [balancing issues networkupstools#1789 vs. networkupstools#316] Signed-off-by: Jim Klimov <[email protected]>

… checking [networkupstools#1789 vs. networkupstools#316] Signed-off-by: Jim Klimov <[email protected]>

…e banner_is_disabled() checking [networkupstools#1789 vs. networkupstools#316] Signed-off-by: Jim Klimov <[email protected]>

…networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

…tps://www.networkupstools.org/" if PACKAGE_URL points completely elsewhere) [networkupstools#1949] Tested with "VER" command Signed-off-by: Jim Klimov <[email protected]>

…ed "https://www.networkupstools.org/" if PACKAGE_URL points completely elsewhere) [networkupstools#1949] Tested with "GET VAR dummy server.info" command Signed-off-by: Jim Klimov <[email protected]>

…AYS_DESC toggle envvar [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

…fully (and abort if there is no common BASE) [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

…ailed and we fall back [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

…ver DESC or BASE data [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

…lt version info data point [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

Signed-off-by: Jim Klimov <[email protected]>

…codepaths Signed-off-by: Jim Klimov <[email protected]>

…would start or shutdown Signed-off-by: Jim Klimov <[email protected]>

…n) [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

Signed-off-by: Jim Klimov <[email protected]>

…e_dump_conn() [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

…TPID query Signed-off-by: Jim Klimov <[email protected]>

…MPVALUE and DUMPSTATUS queries Signed-off-by: Jim Klimov <[email protected]>

…dsignalfn() Signed-off-by: Jim Klimov <[email protected]>

…us" with socket protocol queries [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

…ide a basic "status" operation [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

…se [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

…f conn->buf [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

AppVeyorBot · 2024-07-31T08:18:36Z

✅ Build nut 2.8.2.2011-master completed (commit eded46e830 by @jimklimov)

Signed-off-by: Jim Klimov <[email protected]>

…am configuration tweaks Signed-off-by: Jim Klimov <[email protected]>

…he example [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

…rkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

…ith column names [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

jimklimov · 2024-07-31T09:34:54Z

Example screenshot currently:

:; upsdrvctl status
Network UPS Tools - UPS driver controller 2.8.2.705.100-805-g68344de5b
Can't open /var/state/ups/dummy-ups-dummy: No such file or directory
dummy   dummy-ups       N/A     -3      NOT_RESPONSIVE  N/A
eco650  usbhid-ups      RUNNING 3559207 RESPONSIVE      3559207 "OL"

… naming Signed-off-by: Jim Klimov <[email protected]>

…psdrvquery_debug_level hushing around upsdrvquery_connect_drvname_upsname() attempt [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

jimklimov · 2024-07-31T09:46:53Z

UPDATED screenshot:

:; NUT_QUIET_INIT_BANNER=true ./drivers/upsdrvctl status
UPSNAME UPSDRV  PF_RUNNING      PF_PID  S_RESPONSIVE    S_PID   S_STATUS
dummy   dummy-ups       N/A     -3      NOT_RESPONSIVE  N/A
eco650  usbhid-ups      RUNNING 3559207 RESPONSIVE      3559207 "OL"

…_GIT_TRUNK if not provided explicitly [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

jimklimov added 10 commits July 30, 2024 14:44

drivers/upsdrvctl.c: add "list" operation [networkupstools#2567]

bfe8f9d

Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c: send_all_drivers(): drop redundant "ups = upstab…

401e8dc

…le" assignments Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c: main(): revise reporting of command_name in debu…

ebba0f6

…g logs [networkupstools#2567] ...and avoid a potential argv array overflow (or at least useless NULL reporting) along the way Signed-off-by: Jim Klimov <[email protected]>

conf/nut.conf.sample, docs/man/nut.conf.txt: document NUT_DEBUG_PID m…

d1c7450

…issed before [networkupstools#2118] Signed-off-by: Jim Klimov <[email protected]>

conf/nut.conf.sample, docs/man/nut.conf.txt: document NUT_QUIET_INIT_…

d6edd9d

…UPSNOTIFY missed before [networkupstools#2136] Signed-off-by: Jim Klimov <[email protected]>

conf/nut.conf.sample: document NUT_QUIET_INIT_SSL missed before [netw…

e36c959

…orkupstools#1662] Signed-off-by: Jim Klimov <[email protected]>

Introduce NUT_QUIET_INIT_BANNER envvar support and `banner_is_disab…

4da928b

…led()` common method [balancing issues networkupstools#1789 vs. networkupstools#316] Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c, docs/man/upsdrvctl.txt: use banner_is_disabled()…

65250a9

… checking [networkupstools#1789 vs. networkupstools#316] Signed-off-by: Jim Klimov <[email protected]>

clients/upslog.c, clients/upsmon.c, drivers/main.c, server/upsd.c: us…

06be3c8

…e banner_is_disabled() checking [networkupstools#1789 vs. networkupstools#316] Signed-off-by: Jim Klimov <[email protected]>

tools/gitlog2version.sh: default PACKAGE_URL with "www" in the string […

30748bd

…networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

jimklimov added enhancement documentation service/daemon start/stop General subject for starting and stopping NUT daemons (drivers, server, monitor); also BG/FG/Debug NUT protocols labels Jul 30, 2024

jimklimov added this to the 2.8.3 milestone Jul 30, 2024

jimklimov force-pushed the issue-2567 branch from c41fe43 to 2e94c6a Compare July 30, 2024 14:57

jimklimov added 5 commits July 30, 2024 17:27

server/netmisc.c: net_ver(): refer to PACKAGE_URL (and hard-coded "ht…

1aaea1f

…tps://www.networkupstools.org/" if PACKAGE_URL points completely elsewhere) [networkupstools#1949] Tested with "VER" command Signed-off-by: Jim Klimov <[email protected]>

server/netget.c: get_var_server(): refer to PACKAGE_URL (and hard-cod…

73f0edd

…ed "https://www.networkupstools.org/" if PACKAGE_URL points completely elsewhere) [networkupstools#1949] Tested with "GET VAR dummy server.info" command Signed-off-by: Jim Klimov <[email protected]>

tools/gitlog2version.sh: refactor with a separate NUT_VERSION_GIT_ALW…

bffaa48

…AYS_DESC toggle envvar [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

tools/gitlog2version.sh: only consider BASE after we get DESC success…

5a71a86

…fully (and abort if there is no common BASE) [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

tools/gitlog2version.sh: report if Git-based version info discovery f…

f2e3d1f

…ailed and we fall back [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

jimklimov force-pushed the issue-2567 branch from 2e94c6a to f2e3d1f Compare July 30, 2024 15:28

jimklimov added 8 commits July 30, 2024 19:48

tools/gitlog2version.sh: getver_git(): "return 1" if we fail to disco…

0f0adf7

…ver DESC or BASE data [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

tools/gitlog2version.sh: Set exit code based on availability of defau…

1f50d50

…lt version info data point [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

tests/NIT/nit.sh: introduce NUT_FOREGROUND_WITH_PID=true tweak

1331168

Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c: comment why pidfn is not used in apparent WIN32 …

562aa18

…codepaths Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c: only log suggestions about exec debugging if we …

0103653

…would start or shutdown Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c: add "status" operation (initially triial skeleto…

d98e934

…n) [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

docs/maintainer-guide.txt: note bumping wikipedia article

60fc49b

Signed-off-by: Jim Klimov <[email protected]>

drivers/dstate.c: refactor st_tree_dump_conn_one_node() out of st_tre…

63f2e44

…e_dump_conn() [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

jimklimov added 5 commits July 31, 2024 01:29

drivers/dstate.c, docs/sock-protocol.txt, docs/nut.dict: implement GE…

0237eee

…TPID query Signed-off-by: Jim Klimov <[email protected]>

drivers/dstate.c, docs/sock-protocol.txt, docs/nut.dict: implement DU…

68627eb

…MPVALUE and DUMPSTATUS queries Signed-off-by: Jim Klimov <[email protected]>

common/common.c, include/common.h: refactor parsepidfile() out of sen…

eba8bb0

…dsignalfn() Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c, docs/man/upsdrvctl.txt: complete "upsdrvctl stat…

e003a29

…us" with socket protocol queries [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

scripts/upsdrvsvcctl/upsdrvsvcctl.in, docs/man/upsdrvsvcctl.txt: prov…

5e1f48b

…ide a basic "status" operation [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

jimklimov force-pushed the issue-2567 branch from 266798a to 5e1f48b Compare July 31, 2024 02:09

jimklimov changed the title ~~Teach upsdrvctl to list device config names, and to optionally hide the start-up banner~~ Teach upsdrvctl to list device config names and show run-time status, and to optionally hide the start-up banner Jul 31, 2024

This comment was marked as resolved.

Sign in to view

jimklimov added 2 commits July 31, 2024 09:36

drivers/upsdrvctl.c: status_driver(): upsdrvquery_close(conn) after u…

27219be

…se [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c: status_driver(): no need to check for NULLness o…

68344de

…f conn->buf [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

jimklimov force-pushed the issue-2567 branch from f2871f5 to 68344de Compare July 31, 2024 07:36

jimklimov added 6 commits July 31, 2024 11:16

conf/nut.conf.sample: update heading comments (IMPORTANT NOTES)

1917e0d

Signed-off-by: Jim Klimov <[email protected]>

docs/man/nut.conf.txt: update IMPORTANT NOTES

08f35d8

Signed-off-by: Jim Klimov <[email protected]>

conf/nut.conf.sample: prepare to export envvars which are NUT progr…

8b4cdfc

…am configuration tweaks Signed-off-by: Jim Klimov <[email protected]>

docs/man/upsdrvctl.txt: status: clarify print-out syntax just after t…

5b565d7

…he example [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

docs/man/upsdrvctl.txt: status: clarify PF_PID negative values [netwo…

1e0d177

…rkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c, docs/man/upsdrvctl.txt: status: print a header w…

07fea65

…ith column names [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

jimklimov added 2 commits July 31, 2024 11:39

drivers/upsdrvquery.c: upsdrvquery_connect(): fix pidfn=>sockname var…

dd6595e

… naming Signed-off-by: Jim Klimov <[email protected]>

drivers/upsdrvctl.c: fix use of nut_sendsignal_debug_level; add nut_u…

6649285

…psdrvquery_debug_level hushing around upsdrvquery_connect_drvname_upsname() attempt [networkupstools#2567] Signed-off-by: Jim Klimov <[email protected]>

tools/gitlog2version.sh: actively discover a newest known NUT_VERSION…

fac5343

…_GIT_TRUNK if not provided explicitly [networkupstools#1949] Signed-off-by: Jim Klimov <[email protected]>

jimklimov mentioned this pull request Jul 31, 2024

daemons lack a -q (quiet flag) #1789

Closed

jimklimov merged commit ddcf7b9 into networkupstools:master Jul 31, 2024
30 checks passed

jimklimov deleted the issue-2567 branch July 31, 2024 17:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Teach `upsdrvctl` to list device config names and show run-time `status`, and to optionally hide the start-up banner #2568

Teach `upsdrvctl` to list device config names and show run-time `status`, and to optionally hide the start-up banner #2568

jimklimov commented Jul 30, 2024 •

edited

Loading

This comment was marked as resolved.

AppVeyorBot commented Jul 31, 2024

jimklimov commented Jul 31, 2024

jimklimov commented Jul 31, 2024

Teach upsdrvctl to list device config names and show run-time status, and to optionally hide the start-up banner #2568

Teach upsdrvctl to list device config names and show run-time status, and to optionally hide the start-up banner #2568

Conversation

jimklimov commented Jul 30, 2024 • edited Loading

This comment was marked as resolved.

AppVeyorBot commented Jul 31, 2024

jimklimov commented Jul 31, 2024

jimklimov commented Jul 31, 2024

Teach `upsdrvctl` to list device config names and show run-time `status`, and to optionally hide the start-up banner #2568

Teach `upsdrvctl` to list device config names and show run-time `status`, and to optionally hide the start-up banner #2568

jimklimov commented Jul 30, 2024 •

edited

Loading