crossroads

commit aa07a8f8323e058f60af8d4a1eb506b6c6a9451a
parent 758ebe7b9fa345fc7f59590bf9755324c128a088
Author: finwo <finwo@pm.me>
Date:   Sat,  3 Jan 2026 19:38:22 +0100

2.59

Diffstat:
M
ChangeLog
 | 
5
+++++
M
Makefile
 | 
2
+-
M
xrctl/xrctl
 | 
5
+++--

3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+2.59 [KK 2009-10-14]
+- Bugfix in logger handling of xrctl, read
+  http://xrforum.org/viewtopic.php?t=495 if you fancy. Thanks Hobbit
+  for reporting this!
+  
 2.58 [KK 2009-10-14] 
 - Added test/ftp.xml as a sample ftp service configuration.
 - Implemented URL-based dispatching: flag --url-match/-j, present in
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 # Top-level Makefile for XR
 # -------------------------
 
-VER	   = 2.58
+VER	   = 2.59
 PREFIX	   = $(DESTDIR)/usr
 BINDIR	   = $(PREFIX)/sbin
 MANDIR	   = $(PREFIX)/share/man
diff --git a/xrctl/xrctl b/xrctl/xrctl
@@ -245,7 +245,7 @@ sub cmd_status {
 }
 
 sub cmd_rotate {
-    if ($sysconf{uselogger} and find_bin($default_logger)) {
+    if (istrue($sysconf{uselogger}) and find_bin($default_logger)) {
 	print ("Rotating not necessary, logging goes via logger\n");
 	return;
     }
@@ -448,9 +448,10 @@ sub log_file {
     my $service = shift;
     my $logger = find_bin($default_logger);
     if (istrue($sysconf{uselogger}) and defined($logger)) {
-	if ($logger eq 'logger') {
+	if ($default_logger eq 'logger') {
 	    return ("|$logger -t 'xr-$service'");
 	} else {
+	    $logger =~ s/\{service\}/$service/g; 
 	    return ("|$logger");
 	}
     } else {