Skip to content

Conversation

zykh
Copy link
Contributor

@zykh zykh commented Feb 11, 2019

Follow-up to #659 -- #659 (comment)

zykh added 3 commits February 10, 2019 23:11
This is just a big, big rename, no code changes.
Add a couple of functions to change in a predictable way the value of the general enablement of tracking and make it visible only inside upsd.c.
Also, move the tracking type (tracking_t) and the list of items inside upsd.c.
@clepple
Copy link
Member

clepple commented Feb 11, 2019

Same comments as on #659. I do think the TRACKING name is preferable.

I have only had time to test the client-side error handling - I was hoping to do more with this over the weekend, but I was rewiring the network, and went down a rabbit hole trying to get a physical UPS running for testing. I might have some time later tonight to build and test the changes on the server side.

zykh added 4 commits February 11, 2019 23:23
Rename the default timeout used in network operations by upsclient and nut-scanner to be more specific: from DEFAULT_TIMEOUT to DEFAULT_NETWORK_TIMEOUT.
Plus, make the default timeout used when retrieving the result of an INSTCMD/SET VAR with TRACKING enabled a common #define'd value (DEFAULT_TRACKING_TIMEOUT), and use it also to publish the default value of the -t option in the help messages of upscmd and upsrw.

As suggested by Charles Lepple.
Also, remove some nesting in tracking_del().
To keep things simple, at least for now, only generate manpages and not html pages (and, as such, don't even think of using our linkman AsciiDoc macro with those functions, to avoid dead links).
- addition of upscli_{read,send}line_timeout(),
- upscli_cleanup() -> upcli_cleanup(void)

Note: only increase 'current' and not 'age', because the upscli_cleanup() change could (potentially) make it not compatible with previous versions.
@zykh zykh merged commit 663dd9f into cmdset_status Feb 12, 2019
@jimklimov jimklimov added this to the 2.8.0 milestone Mar 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants