Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove old stuff #16

Merged
merged 6 commits into from
Aug 14, 2024
Merged

remove old stuff #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
532c163
remove old stuff
mroda88 Jul 29, 2024
63c1a74
Change to register_node
mroda88 Aug 6, 2024
3ba7207
Style names
mroda88 Aug 6, 2024
fa6f639
Style names
mroda88 Aug 6, 2024
d3ac5ea
Getting rid of old debries
mroda88 Aug 9, 2024
9409faf
more cleanup
mroda88 Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ daq_add_library(*.cpp LINK_LIBRARIES ${Boost_LIBRARIES} opmonlib::opmonlib RdKaf
##############################################################################
# Plugins

daq_add_plugin(kafkaOpmonService duneOpmonService LINK_LIBRARIES opmonlib::opmonlib RdKafka::rdkafka RdKafka::rdkafka++ ers::ers kafkaopmon)
daq_add_plugin(streamOpMonFacility duneOpMonFacility LINK_LIBRARIES kafkaopmon)
target_include_directories(kafkaopmon_kafkaOpmonService_duneOpmonService PUBLIC)

## The following application is deprecated
## The correct consumer to feed influxdb is contained in microservice
Expand All @@ -43,7 +41,6 @@ daq_add_unit_test( stream_OpMonFacility_test LINK_LIBRARIES kafkaopmon )
##############################################################################
# test application

daq_add_application( test_flattener test_flattener.cxx TEST LINK_LIBRARIES kafkaopmon)
daq_add_application( opmon_publisher_test opmon_publisher_test.cxx TEST LINK_LIBRARIES kafkaopmon )
daq_add_application( opmon_publish_to_kafka_test opmon_publish_to_kafka_test.cxx TEST LINK_LIBRARIES kafkaopmon )

Expand Down
151 changes: 0 additions & 151 deletions plugins/kafkaOpmonService.cpp
View file
Open in desktop

This file was deleted.

100 changes: 0 additions & 100 deletions src/JsonFlattener.cpp
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions src/JsonFlattener.hpp
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions test/apps/opmon_publish_to_kafka_test.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <thread>
#include <future>

#include "opmonlib/info/test.pb.h"
#include "opmonlib/opmon/test.pb.h"

#include <boost/program_options.hpp>

Expand All @@ -20,7 +20,7 @@ using namespace dunedaq::opmonlib;
class TestObject : public MonitorableObject {

public:
using MonitorableObject::register_child;
using MonitorableObject::register_node;
using MonitorableObject::publish;
TestObject() : MonitorableObject() {;}
};
Expand Down Expand Up @@ -60,7 +60,7 @@ main(int argc, char const* argv[])
std::vector<std::shared_ptr<TestObject>> objs(n);
for ( size_t i = 0; i < n; ++i ) {
auto p = objs[i] = std::make_shared<TestObject>();
man.register_child( "element_" + std::to_string(i), p );
man.register_node( "element_" + std::to_string(i), p );
}

auto pub_func = [&](int i, std::shared_ptr<TestObject> p){
Expand Down
2 changes: 1 addition & 1 deletion test/apps/opmon_publisher_test.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <kafkaopmon/OpMonPublisher.hpp>
#include "opmonlib/Utils.hpp"
#include "opmonlib/info/test.pb.h"
#include "opmonlib/opmon/test.pb.h"

#include <boost/program_options.hpp>

Expand Down
Loading
Loading