Skip to content

Commit 89bd87e

Browse files
committed
temporarty using internal loging
1 parent a09c4e3 commit 89bd87e

File tree

5 files changed

+5
-16
lines changed

5 files changed

+5
-16
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ project(Monitoring)
2424
# Load some basic macros which are needed later on
2525
include(O2Utils)
2626
include(MonitoringDependencies)
27-
include(O2) # to be removed
28-
29-
link_o2_subproject(Common)
30-
link_o2_subproject(InfoLogger)
3127

3228
# Set the default build type to "RelWithDebInfo"
3329
if(NOT CMAKE_BUILD_TYPE)

cmake/FindAPMON.cmake

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,4 @@ set(APMON_LIBRARIES ${APMON_LIBRARY})
2424
find_package_handle_standard_args(APMON "ApMon could not be found. Install package ApMon_cpp."
2525
APMON_LIBRARY APMON_INCLUDE_DIR)
2626

27-
if(APMON_FOUND)
28-
message(info "APMON found")
29-
endif()
30-
3127
mark_as_advanced(APMON_INCLUDE_DIR APMON_LIBRARY)

cmake/MonitoringDependencies.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ o2_define_bucket(
1717
o2_monitoring_bucket
1818

1919
DEPENDENCIES
20-
Common
21-
InfoLogger
2220
${Configuration_LIBRARIES}
2321
${Boost_SYSTEM_LIBRARY}
2422
${Boost_FILESYSTEM_LIBRARY}
23+
${Boost_PROGRAM_OPTIONS_LIBRARY}
2524
${extra_deps}
2625

2726
SYSTEMINCLUDE_DIRECTORIES

src/Backends/InfoLoggerBackend.cxx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ namespace Monitoring
1717
namespace Backends
1818
{
1919

20-
using AliceO2::InfoLogger::InfoLogger;
21-
2220
inline unsigned long InfoLoggerBackend::convertTimestamp(const std::chrono::time_point<std::chrono::system_clock>& timestamp)
2321
{
2422
return std::chrono::duration_cast <std::chrono::milliseconds>(
@@ -48,10 +46,10 @@ void InfoLoggerBackend::send(const Metric& metric)
4846
}
4947
metricTags += tag.name + "=" + tag.value;
5048
}
51-
mInfoLogger << InfoLogger::Severity::Debug << "InfoLoggerMonitoring : " << metric.getName() << ", "
49+
MonLogger::Get() << "InfoLoggerMonitoring : " << metric.getName() << ", "
5250
<< metric.getValue() << " Type: " << metric.getType() << ", "
5351
<< convertTimestamp(metric.getTimestamp()) << ", " << tagString << " " << metricTags
54-
<< InfoLogger::endm;
52+
<< MonLogger::End();
5553
}
5654

5755
} // namespace Backends

src/Backends/InfoLoggerBackend.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#define ALICEO2_MONITORING_CORE_INFOLOGGER_BACKEND_H
88

99
#include "Monitoring/Backend.h"
10-
#include <InfoLogger/InfoLogger.hxx>
10+
//#include <InfoLogger/InfoLogger.hxx>
1111
#include <string>
1212

1313
namespace AliceO2
@@ -48,7 +48,7 @@ class InfoLoggerBackend final : public Backend
4848

4949
std::string tagString; ///< Global tagset (common for each metric)
5050

51-
AliceO2::InfoLogger::InfoLogger mInfoLogger;
51+
//AliceO2::InfoLogger::InfoLogger mInfoLogger;
5252
};
5353

5454
} // namespace Backends

0 commit comments

Comments
 (0)