You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2019/05/02 15:26:04 UTC
[commons-daemon] branch master updated: Fix DAEMON-391. Log level
"Warning" not recognised.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new d534332 Fix DAEMON-391. Log level "Warning" not recognised.
d534332 is described below
commit d534332a170fabbe1994bb4d0b1a418ec13c2956
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 2 16:25:47 2019 +0100
Fix DAEMON-391. Log level "Warning" not recognised.
The correct value is "Warn". Fix this and order the entries in the log
level drop-down.
---
src/changes/changes.xml | 5 +++++
src/native/windows/apps/prunmgr/prunmgr.c | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 8d2d70b..61e7242 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -52,6 +52,11 @@
<action issue="DAEMON-384" type="fix" dev="ggregory" due-to="blassmegod">
Procrun. prunsrv stopping with error due to hard-coded timeout.
</action>
+ <action issue="DAEMON-391" type="fix" dev="markt" due-to="Thorsten Schöning">
+ Procrun. Correct the level name used in the GUI for WARN so that changes
+ made via the GUI are recognised. Order the log levels in the drop-down
+ from ERROR to DEBUG.
+ </action>
<action issue="DAEMON-393" type="fix" dev="ggregory" due-to="Daniel Hofmann">
Procrun. Revered code comments for JRE and JDK locations in the
registry.
diff --git a/src/native/windows/apps/prunmgr/prunmgr.c b/src/native/windows/apps/prunmgr/prunmgr.c
index 600370a..610b7c6 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.c
+++ b/src/native/windows/apps/prunmgr/prunmgr.c
@@ -46,7 +46,7 @@ LPAPXGUISTORE _gui_store = NULL;
#define LOGL_ERROR L"Error"
#define LOGL_DEBUG L"Debug"
#define LOGL_INFO L"Info"
-#define LOGL_WARN L"Warning"
+#define LOGL_WARN L"Warn"
#define START_AUTO L"Automatic"
@@ -869,8 +869,8 @@ LRESULT CALLBACK __loggingProperty(HWND hDlg,
apxCenterWindow(GetParent(hDlg), NULL);
bpropCentered = TRUE;
ComboBox_AddStringW(GetDlgItem(hDlg, IDC_PPLGLEVEL), LOGL_ERROR);
- ComboBox_AddStringW(GetDlgItem(hDlg, IDC_PPLGLEVEL), LOGL_INFO);
ComboBox_AddStringW(GetDlgItem(hDlg, IDC_PPLGLEVEL), LOGL_WARN);
+ ComboBox_AddStringW(GetDlgItem(hDlg, IDC_PPLGLEVEL), LOGL_INFO);
ComboBox_AddStringW(GetDlgItem(hDlg, IDC_PPLGLEVEL), LOGL_DEBUG);
if ((b = apxRegistryGetStringW(hRegserv, APXREG_PARAMSOFTWARE,
_s_log, L"Level")) != NULL) {