Merge 4fed2e3 into a456b00

Author: jimklimov

NEWS.adoc

@@ -120,6 +120,9 @@ https://github.com/networkupstools/nut/milestone/12
    * Introduced `upssched -l` mode to list currently tracked timers. [#3097]
    * Make use of `setproctag()` and `getproctag()` to report parent/child
      process names. [#3084]
+   * Introduced optional passing of `NOTIFYMSG` text (normally originating
+     from `upsmon` which calls `upssched`) as an environment variable into
+     the ultimately executed `CMDSCRIPT` processes. [#3105]
 
  - `configure` script options:
    * Introduced `--with-python{,2,3}-modules-dir` to specify PyNUT(Client)

clients/upsmon.c

@@ -280,6 +280,7 @@ static unsigned __stdcall async_notify(LPVOID param)
 		if (notifycmd != NULL) {
 			snprintf(exec, sizeof(exec), "%s \"%s\"", notifycmd, data->notice);
 
+			upsdebugx(6, "%s: Calling NOTIFYCMD: %s", __func__, exec);
 			if (data->upsname)
 				setenv("UPSNAME", data->upsname, 1);
 			else

clients/upssched-cmd

@@ -17,8 +17,8 @@
 echo "`date -u`: $0: THIS IS A SAMPLE SCRIPT, PLEASE TAILOR IT FOR YOUR DEPLOYMENT OF NUT!" >&2
 logger -t upssched-cmd "THIS IS A SAMPLE SCRIPT, PLEASE TAILOR IT FOR YOUR DEPLOYMENT OF NUT!"
 
-printf "`date -u`: UPSNAME='%s'\tNOTIFYTYPE='%s'\targs=%s\n" "$UPSNAME" "$NOTIFYTYPE" "$@" >&2
-printf "UPSNAME='%s' NOTIFYTYPE='%s' args=%s\n" "$UPSNAME" "$NOTIFYTYPE" "$@" | logger -t upssched-cmd-received-NOTIFYTYPE
+printf "`date -u`: UPSNAME='%s'\tNOTIFYTYPE='%s'\tNOTIFYMSG='%s'\targs=%s\n" "$UPSNAME" "$NOTIFYTYPE" "$NOTIFYMSG" "$*" >&2
+printf "UPSNAME='%s' NOTIFYTYPE='%s' NOTIFYMSG='%s' args=%s\n" "$UPSNAME" "$NOTIFYTYPE" "$NOTIFYMSG" "$*" | logger -t upssched-cmd-received-NOTIFYTYPE
 
 #set