From d2aae07ceed4eb2e03ba5583b6d7d9652e7ed49e Mon Sep 17 00:00:00 2001
From: Ruud Overeem <overeem@astron.nl>
Date: Wed, 29 Sep 2010 12:16:10 +0000
Subject: [PATCH] Bug 1000: Fixed bug in LogProcessor due to basename patch and
a missing ':' in StationControl.
---
MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc | 2 +-
MAC/APL/StationCU/src/StationControl/StationControlMain.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
index cd1f19a9626..08a5972dc14 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
@@ -254,7 +254,7 @@ GCFEvent::TResult LogProcessor::operational(GCFEvent& event,
getLogLevelManager().toString(l4cpLogEvent.getLogLevel()).c_str(),
l4cpLogEvent.getLoggerName().c_str(),
l4cpLogEvent.getMessage().c_str(),
- basename(l4cpLogEvent.getFile().c_str()),
+ basename(l4cpLogEvent.getFile()).c_str(),
l4cpLogEvent.getLine()));
#if 0
diff --git a/MAC/APL/StationCU/src/StationControl/StationControlMain.cc b/MAC/APL/StationCU/src/StationControl/StationControlMain.cc
index 2712aa55e26..38ff113ea9e 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControlMain.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControlMain.cc
@@ -48,7 +48,7 @@ int main(int argc, char* argv[])
string myName;
if (argc < 2) { // started by swlevel?
- myName = myHostname(false) + basename(argv[0]);
+ myName = myHostname(false) + ":" + basename(argv[0]);
}
else {
myName = argv[1];
--
GitLab