FreeBSD Bugzilla – Attachment 236045 Details for
Bug 265963
sysutils/nut: add possibility to log status of several UPSes
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Final patch
0001-sysutils-nut-Add-upslog-support-for-multiple-UPSs.patch (text/plain), 9.15 KB, created by
Cy Schubert
on 2022-08-21 15:33:15 UTC
(
hide
)
Description:
Final patch
Filename:
MIME Type:
Creator:
Cy Schubert
Created:
2022-08-21 15:33:15 UTC
Size:
9.15 KB
patch
obsolete
>From a0313d498487e1bfbbf26305119ae817ba183e74 Mon Sep 17 00:00:00 2001 >From: Cy Schubert <cy@FreeBSD.org> >Date: Sun, 21 Aug 2022 08:21:51 -0700 >Subject: [PATCH] sysutils/nut*: Add upslog support for multiple UPSs > >upslog is a utility that logs UPS status at regular intervals, specified >by the -i option. Unfortunately upslog supports only on UPS. For sites >that need to monitor multiple UPSs the options are to cobble an rc script >for each or doctor up the nut_upslog.in script to support cloning of the >script. Unfortunately an rc script capable of being cloned would become >the source of more PRs and would require significanly more tehcnical >documentation that by itself might become confusing for the average >system administrator. > >Therefore a new -m option is added to support multiple UPSs using the >same invocation of upslog. The patch parses a -m option and forks >almost immediately following the getopt(3) invokation to monitor each >individual UPS using a separate upslog process. This is not ideal but >better than scripting. Lightweight threads might be a better solution. > >This patch will be refined over a period oftime and will be upstreamed >when ready. > >PR: 265963 >Reported by: vvd@unislabs.com >--- > sysutils/nut-devel/Makefile | 1 + > .../nut-devel/files/patch-clients_upslog.c | 107 ++++++++++++++++++ > sysutils/nut/Makefile | 2 +- > sysutils/nut/files/patch-clients_upslog.c | 107 ++++++++++++++++++ > 4 files changed, 216 insertions(+), 1 deletion(-) > create mode 100644 sysutils/nut-devel/files/patch-clients_upslog.c > create mode 100644 sysutils/nut/files/patch-clients_upslog.c > >diff --git a/sysutils/nut-devel/Makefile b/sysutils/nut-devel/Makefile >index 9e30974d0999..e40b38582e55 100644 >--- a/sysutils/nut-devel/Makefile >+++ b/sysutils/nut-devel/Makefile >@@ -1,5 +1,6 @@ > PORTNAME= nut > PORTVERSION= ${NUT_COMMIT_DATE} >+PORTREVISION= 1 > CATEGORIES= sysutils > PKGNAMESUFFIX= -devel > # MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ >diff --git a/sysutils/nut-devel/files/patch-clients_upslog.c b/sysutils/nut-devel/files/patch-clients_upslog.c >new file mode 100644 >index 000000000000..96393d3d17d1 >--- /dev/null >+++ b/sysutils/nut-devel/files/patch-clients_upslog.c >@@ -0,0 +1,107 @@ >+--- clients/upslog.c.orig 2022-08-20 17:43:30.860772000 -0700 >++++ clients/upslog.c 2022-08-20 22:00:44.566658000 -0700 >+@@ -32,6 +32,8 @@ >+ */ >+ >+ #include "common.h" >++#include <unistd.h> >++#include <sys/wait.h> >+ #include "nut_platform.h" >+ #include "upsclient.h" >+ >+@@ -41,16 +43,28 @@ >+ #include "upslog.h" >+ >+ static int reopen_flag = 0, exit_flag = 0; >++ static int wait_status, num_monhosts = 0; >+ static uint16_t port; >+ static char *upsname, *hostname; >+ static UPSCONN_t ups; >+ >+ static FILE *logfile; >+- static const char *logfn, *monhost; >++ static char *logfn, *monhost; >+ static sigset_t nut_upslog_sigmask; >+ static char logbuffer[LARGEBUF], *logformat; >+ >+ static flist_t *fhead = NULL; >++ struct monhost_child { >++ char *monhost; >++ char *logfn; >++ char *pidfilebase; >++ pid_t pid; >++ struct monhost_child *next; >++ }; >++ static struct monhost_child *monhost_child_anchor = NULL; >++ static struct monhost_child *monhost_child_current; >++ static struct monhost_child *monhost_child_prev = NULL; >++ static char *m_arg; >+ >+ #define DEFAULT_LOGFORMAT "%TIME @Y@m@d @H@M@S% %VAR battery.charge% " \ >+ "%VAR input.voltage% %VAR ups.load% [%VAR ups.status%] " \ >+@@ -396,18 +410,19 @@ >+ int main(int argc, char **argv) >+ { >+ int interval = 30, i, foreground = -1; >++ size_t monhost_len; >+ const char *prog = xbasename(argv[0]); >+ time_t now, nextpoll = 0; >+ const char *user = NULL; >+ struct passwd *new_uid = NULL; >+- const char *pidfilebase = prog; >++ char *pidfilebase = prog; >+ >+ logformat = DEFAULT_LOGFORMAT; >+ user = RUN_AS_USER; >+ >+ printf("Network UPS Tools %s %s\n", prog, UPS_VERSION); >+ >+- while ((i = getopt(argc, argv, "+hs:l:i:f:u:Vp:FB")) != -1) { >++ while ((i = getopt(argc, argv, "+hs:l:i:f:u:Vp:FBm:")) != -1) { >+ switch(i) { >+ case 'h': >+ help(prog); >+@@ -415,6 +430,19 @@ >+ break; >+ #endif >+ >++ case 'm': >++ monhost_child_prev = monhost_child_current; >++ monhost_child_current = malloc(sizeof(struct monhost_child)); >++ if (monhost_child_anchor == NULL) >++ monhost_child_anchor = monhost_child_current; >++ else >++ monhost_child_prev->next = monhost_child_current; >++ monhost_child_current->next = NULL; >++ m_arg = optarg; >++ monhost_child_current->monhost = strsep(&m_arg, ":"); >++ monhost_child_current->logfn = strsep(&m_arg, ":"); >++ monhost_child_current->pidfilebase = strsep(&m_arg, ":"); >++ break; >+ case 's': >+ monhost = optarg; >+ break; >+@@ -478,6 +506,23 @@ >+ for (i = 3; i < argc; i++) >+ snprintfcat(logformat, LARGEBUF, "%s ", argv[i]); >+ } >++ >++ if (monhost_child_anchor != NULL) { >++ for (monhost_child_current = monhost_child_anchor; >++ monhost_child_current != NULL; >++ monhost_child_current = monhost_child_current->next) { >++ if ((monhost_child_current->pid = fork()) == 0) { >++ monhost = monhost_child_current->monhost; >++ logfn = monhost_child_current->logfn; >++ pidfilebase = monhost_child_current->pidfilebase; >++ break; >++ } >++ } >++ if (monhost_child_anchor->pid) >++ exit(EXIT_SUCCESS); >++ } >++ >++ /* When num_monhosts == 1 monhost remains the only argument */ >+ >+ if (!monhost) >+ fatalx(EXIT_FAILURE, "No UPS defined for monitoring - use -s <system>"); >diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile >index 4409b60de0af..e388164c19b6 100644 >--- a/sysutils/nut/Makefile >+++ b/sysutils/nut/Makefile >@@ -1,6 +1,6 @@ > PORTNAME= nut > PORTVERSION= 2.8.0 >-PORTREVISION= 6 >+PORTREVISION= 7 > CATEGORIES= sysutils > MASTER_SITES= http://www.networkupstools.org/source/${PORTVERSION:R}/ > >diff --git a/sysutils/nut/files/patch-clients_upslog.c b/sysutils/nut/files/patch-clients_upslog.c >new file mode 100644 >index 000000000000..96393d3d17d1 >--- /dev/null >+++ b/sysutils/nut/files/patch-clients_upslog.c >@@ -0,0 +1,107 @@ >+--- clients/upslog.c.orig 2022-08-20 17:43:30.860772000 -0700 >++++ clients/upslog.c 2022-08-20 22:00:44.566658000 -0700 >+@@ -32,6 +32,8 @@ >+ */ >+ >+ #include "common.h" >++#include <unistd.h> >++#include <sys/wait.h> >+ #include "nut_platform.h" >+ #include "upsclient.h" >+ >+@@ -41,16 +43,28 @@ >+ #include "upslog.h" >+ >+ static int reopen_flag = 0, exit_flag = 0; >++ static int wait_status, num_monhosts = 0; >+ static uint16_t port; >+ static char *upsname, *hostname; >+ static UPSCONN_t ups; >+ >+ static FILE *logfile; >+- static const char *logfn, *monhost; >++ static char *logfn, *monhost; >+ static sigset_t nut_upslog_sigmask; >+ static char logbuffer[LARGEBUF], *logformat; >+ >+ static flist_t *fhead = NULL; >++ struct monhost_child { >++ char *monhost; >++ char *logfn; >++ char *pidfilebase; >++ pid_t pid; >++ struct monhost_child *next; >++ }; >++ static struct monhost_child *monhost_child_anchor = NULL; >++ static struct monhost_child *monhost_child_current; >++ static struct monhost_child *monhost_child_prev = NULL; >++ static char *m_arg; >+ >+ #define DEFAULT_LOGFORMAT "%TIME @Y@m@d @H@M@S% %VAR battery.charge% " \ >+ "%VAR input.voltage% %VAR ups.load% [%VAR ups.status%] " \ >+@@ -396,18 +410,19 @@ >+ int main(int argc, char **argv) >+ { >+ int interval = 30, i, foreground = -1; >++ size_t monhost_len; >+ const char *prog = xbasename(argv[0]); >+ time_t now, nextpoll = 0; >+ const char *user = NULL; >+ struct passwd *new_uid = NULL; >+- const char *pidfilebase = prog; >++ char *pidfilebase = prog; >+ >+ logformat = DEFAULT_LOGFORMAT; >+ user = RUN_AS_USER; >+ >+ printf("Network UPS Tools %s %s\n", prog, UPS_VERSION); >+ >+- while ((i = getopt(argc, argv, "+hs:l:i:f:u:Vp:FB")) != -1) { >++ while ((i = getopt(argc, argv, "+hs:l:i:f:u:Vp:FBm:")) != -1) { >+ switch(i) { >+ case 'h': >+ help(prog); >+@@ -415,6 +430,19 @@ >+ break; >+ #endif >+ >++ case 'm': >++ monhost_child_prev = monhost_child_current; >++ monhost_child_current = malloc(sizeof(struct monhost_child)); >++ if (monhost_child_anchor == NULL) >++ monhost_child_anchor = monhost_child_current; >++ else >++ monhost_child_prev->next = monhost_child_current; >++ monhost_child_current->next = NULL; >++ m_arg = optarg; >++ monhost_child_current->monhost = strsep(&m_arg, ":"); >++ monhost_child_current->logfn = strsep(&m_arg, ":"); >++ monhost_child_current->pidfilebase = strsep(&m_arg, ":"); >++ break; >+ case 's': >+ monhost = optarg; >+ break; >+@@ -478,6 +506,23 @@ >+ for (i = 3; i < argc; i++) >+ snprintfcat(logformat, LARGEBUF, "%s ", argv[i]); >+ } >++ >++ if (monhost_child_anchor != NULL) { >++ for (monhost_child_current = monhost_child_anchor; >++ monhost_child_current != NULL; >++ monhost_child_current = monhost_child_current->next) { >++ if ((monhost_child_current->pid = fork()) == 0) { >++ monhost = monhost_child_current->monhost; >++ logfn = monhost_child_current->logfn; >++ pidfilebase = monhost_child_current->pidfilebase; >++ break; >++ } >++ } >++ if (monhost_child_anchor->pid) >++ exit(EXIT_SUCCESS); >++ } >++ >++ /* When num_monhosts == 1 monhost remains the only argument */ >+ >+ if (!monhost) >+ fatalx(EXIT_FAILURE, "No UPS defined for monitoring - use -s <system>"); >-- >2.37.2 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=236045">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 265963
:
236026
|
236030
|
236045
|
236049
|
236051
|
236052
|
236072
|
236073
|
236121
|
236127
|
236128
|
236132
|
236194
|
236219
|
236238
|
236243