Skip to content

Follow-up to upsdrvctl status on Windows, add LOGOUT to local socket protocol#2572

Merged
jimklimov merged 16 commits intonetworkupstools:masterfrom
jimklimov:issue-2568-win
Aug 1, 2024
Merged

Follow-up to upsdrvctl status on Windows, add LOGOUT to local socket protocol#2572
jimklimov merged 16 commits intonetworkupstools:masterfrom
jimklimov:issue-2568-win

Conversation

@jimklimov
Copy link
Copy Markdown
Member

@jimklimov jimklimov commented Aug 1, 2024 •
edited
Loading

Address lack of signals, properly close connections, add LOGOUT to dstate (local socket protocol).

Follows up primarily from issue #2567 / PR #2568 but also touches on some other recent work like #1949

UPDATE: Also completes upsdrvsvcctl status, tested with Debian Linux systemd and OpenIndiana SMF

@jimklimov
common/common.c: parsepid(): set errno in case of errors [networkupst…
e43d600 
…ools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
docs/man/upsdrvctl.txt: add an example of "list" with hidden banner [n…
8ed6a70 
…etworkupstools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvctl.c, docs/man/upsdrvctl.txt: "status": detect a RUNNI…
e592b3c 
…NG or not program using PID from *either* PID file or socket protocol [networkupstools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/dstate.c, docs/sock-protocol.txt: introduce a LOGOUT command [n…
e2f8b44 
…etworkupstools#2567]

Now that the driver Unix socket / Windows named pipe connections
can come and go (sibling drivers, `upsdrvctl status`...) it is not
pretty to see logged messages about an unexpected connection loss.
Having it coincide with a LOGOUT is better for troubleshooting.

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvquery.c: upsdrvquery_close(): take advantage of the new…
b3287a1 
… LOGOUT command [networkupstools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
server/netmisc.c: update net_help()
caf59a4 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/dstate.{c,h}: err on the safe side with LOGOUT, and only mark…
eb6eaf4 
… the connection - close later [networkupstools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
tools/gitlog2version.sh: comment why we repeat TRUNK candidate branch…
813ef17 
…es, and add master in the end too [networkupstools#1949]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov jimklimov added enhancement documentation Windows NUT protocols portability We want NUT to build and run everywhere possible labels Aug 1, 2024
@jimklimov jimklimov added this to the 2.8.3 milestone Aug 1, 2024
@jimklimov jimklimov requested a review from aquette August 1, 2024 03:09
@jimklimov
drivers/upsdrvctl.c: status: revise return values of checkprocname() …
056d179 
…vs. sendsignalpid(), unite via pidAlive [networkupstools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
drivers/upsdrvquery.c: upsdrvquery_close(): track if we loggedOut and…
521c721 
… so not complain about disconnection faults [networkupstools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
NEWS.adoc: new dstate LOGOUT command [networkupstools#2567]
7172298 
Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/upsdrvsvcctl/upsdrvsvcctl.in: make path to UPSDRVCTL a variab…
a50b800 
…le, like ENUMERATOR is used [networkupstools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/upsdrvsvcctl/upsdrvsvcctl.in, docs/man/upsdrvsvcctl.txt: add …
5e8b340 
…an option to display binary version (and fix the script one in help) [networkupstools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
scripts/upsdrvsvcctl/upsdrvsvcctl.in, docs/man/upsdrvsvcctl.txt: comp…
8acb12d 
…lete the "upsdrvsvcctl status" feature [networkupstools#2567]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
@jimklimov
Copy link
Copy Markdown
Member Author

jimklimov commented Aug 1, 2024 •
edited
Loading

With recent additions for upsdrvsvcctl status:

  • systemd
:; (cd ./scripts/upsdrvsvcctl/ && make upsdrvsvcctl && ./upsdrvsvcctl status )
make: 'upsdrvsvcctl' is up to date.
SVC_NAME                                      SVC_STATE UPSNAME              UPSDRV     RUNNING PF_PID  S_RESPONSIVE    S_PID   S_STATUS
nut-driver@dummy.service                masked,inactive dummy             dummy-ups     N/A     -3      NOT_RESPONSIVE  N/A
nut-driver@eco650.service                enabled,active eco650           usbhid-ups     RUNNING 2999513 RESPONSIVE      2999513 "OL"

:; upsdrvsvcctl status dummy
SVC_NAME                                      SVC_STATE UPSNAME              UPSDRV     RUNNING PF_PID  S_RESPONSIVE    S_PID   S_STATUS
nut-driver@dummy.service                masked,inactive dummy             dummy-ups     N/A     -3      NOT_RESPONSIVE  N/A
  • SMF (testing just the scripts and upsdrvctl tool against an older NUT build, so driver does not talk socket protocol):
:; NUT_ALTPIDPATH=/var/run/nut NUT_CONFPATH=/etc/nut UPSDRVCTL=`pwd`/drivers/upsdrvctl ENUMERATOR=`pwd`/scripts/upsdrvsvcctl/nut-driver-enumerator.sh  ./scripts/upsdrvsvcctl/upsdrvsvcctl status

SVC_NAME                                  SVC_STATE     UPSNAME              UPSDRV     RUNNING PF_PID  S_RESPONSIVE    S_PID   S_STATUS
svc:/system/power/nut-driver:dummy           online     dummy             dummy-ups     RUNNING 8093    NOT_RESPONSIVE  N/A

@jimklimov
scripts/upsdrvsvcctl/upsdrvsvcctl.in: allow caller to customize ENUME…
30cec0d 
…RATOR and UPSDRVCTL when testing [networkupstools#2567]

Signed-off-by: Jim Klimov <jim@jimklimov.com>
@jimklimov
scripts/upsdrvsvcctl/upsdrvsvcctl.in: adjust SVC_NAME_WIDTH to framew…
5d4338b 
…ork type too [networkupstools#2567]

Signed-off-by: Jim Klimov <jim@jimklimov.com>
@jimklimov jimklimov added Solaris/illumos Solaris and illumos systems (OpenIndiana, OmniOS, SmartOS, TribbliX...) Linux Some issues are specific to Linux as a platform labels Aug 1, 2024
@AppVeyorBot
Copy link
Copy Markdown

AppVeyorBot commented Aug 1, 2024

✅ Build nut 2.8.2.2027-master completed (commit 8fcfef9275 by @jimklimov)

@networkupstools networkupstools deleted a comment from AppVeyorBot Aug 1, 2024
@jimklimov jimklimov merged commit 7b5ca36 into networkupstools:master Aug 1, 2024
@jimklimov jimklimov deleted the issue-2568-win branch August 1, 2024 14:55
@jimklimov jimklimov restored the issue-2568-win branch April 15, 2025 09:51
@jimklimov jimklimov deleted the issue-2568-win branch April 15, 2025 10:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@aquette aquette Awaiting requested review from aquette

Assignees

No one assigned

Labels

documentation enhancement Linux Some issues are specific to Linux as a platform NUT protocols portability We want NUT to build and run everywhere possible Solaris/illumos Solaris and illumos systems (OpenIndiana, OmniOS, SmartOS, TribbliX...) Windows

Projects

None yet

Milestone

2.8.3

Development

Successfully merging this pull request may close these issues.

2 participants

@jimklimov @AppVeyorBot