finished c++ versioning

common/cpp/include/common/version.h.in

@@ -2,13 +2,17 @@
 #define ASAPO_VERSION_H
 
 #include <iostream>
+#include "string.h"
 
 namespace asapo {
 
 const char kVersion[] = "@VERSION@";
 
-inline void PrintVersion(std::string prefix) {
- std::cout << prefix << ", version " << kVersion << std::endl;
+inline void ExitAfterPrintVersionIfNeeded(std::string prefix,int argc, char* argv[]) {
+    if (argc == 2 && strcmp(argv[1], "-v") == 0) {
+        std::cout << prefix << ", version " << kVersion << std::endl;
+        exit(0);
+    }
 }
 
 }

examples/producer/dummy-data-producer/dummy_data_producer.cpp

@@ -35,7 +35,7 @@ void PrintCommandArguments(const Args& args) {
 
 
 void ProcessCommandArguments(int argc, char* argv[], Args* args) {
-    asapo::PrintVersion("Dummy Data Producer");
+    asapo::ExitAfterPrintVersionIfNeeded("Dummy Data Producer", argc, argv);
     if (argc != 8) {
         std::cout <<
                   "Usage: " << argv[0] <<

examples/worker/getnext_broker/getnext_broker.cpp

@@ -79,7 +79,7 @@ int ReadAllData(const Params& params, uint64_t* duration_ms) {
 }
 
 int main(int argc, char* argv[]) {
-    asapo::PrintVersion("GetNext Broker Example");
+    asapo::ExitAfterPrintVersionIfNeeded("GetNext Broker Example", argc, argv);
     if (argc != 6) {
         std::cout << "Usage: " + std::string{argv[0]} +" <server> <run_name> <nthreads> <token> <timeout ms>" << std::endl;
         exit(EXIT_FAILURE);

examples/worker/process_folder/process_folder.cpp

@@ -84,7 +84,7 @@ void PrintStatistics(const Statistics& statistics) {
 
 
 int main(int argc, char* argv[]) {
-    asapo::PrintVersion("Process Folder Broker Example");
+    asapo::ExitAfterPrintVersionIfNeeded("Process Folder Broker Example", argc, argv);
 
     std::string folder = ProcessCommandArguments(argc, argv);
     auto broker = CreateBroker(folder);

producer/event_monitor_producer/src/main_eventmon.cpp

@@ -74,7 +74,7 @@ void SignalHandler(int signal) {
 
 
 int main (int argc, char* argv[]) {
-    asapo::PrintVersion("ASAPO Event Monitor");
+    asapo::ExitAfterPrintVersionIfNeeded("ASAPO Event Monitor", argc, argv);
 
     auto err = ReadConfigFile(argc, argv);
     if (err) {
@@ -96,7 +96,7 @@ int main (int argc, char* argv[]) {
     auto producer = CreateProducer();
     asapo::EventDetectorFactory factory;
     auto event_detector = factory.CreateEventDetector();
-
+    logger->Info(std::string("starting ASAPO Event Monitor, version ") + asapo::kVersion);
     err = event_detector->StartMonitoring();
     if (err) {
         logger->Error(err->Explain());

receiver/src/main.cpp

@@ -17,7 +17,7 @@ asapo::Error ReadConfigFile(int argc, char* argv[]) {
 }
 
 int main (int argc, char* argv[]) {
-    asapo::PrintVersion("ASAPO Receiver");
+    asapo::ExitAfterPrintVersionIfNeeded("ASAPO Receiver", argc, argv);
 
     auto err = ReadConfigFile(argc, argv);
     const auto& logger = asapo::GetDefaultReceiverLogger();
@@ -35,6 +35,7 @@ int main (int argc, char* argv[]) {
 
     auto* receiver = new asapo::Receiver();
 
+    logger->Info(std::string("starting receiver, version ") + asapo::kVersion);
     logger->Info("listening on " + address);
     receiver->Listen(address, &err);
     if(err) {

receiver/src/request_handler_authorize.cpp

@@ -48,6 +48,9 @@ Error RequestHandlerAuthorize::Authorize(Request* request, const char* beamtime_
     (err = parser.GetString("Beamline", &beamline_));
     if (err) {
         return ErrorFromServerResponse(err, code);
+    } else {
+        log__->Debug(std::string("authorized connection from ") + request->GetOriginUri() + " beamline: " +
+                     beamline_ + ", beamtime id: " + beamtime_id_);
     }
 
     return nullptr;

receiver/unittests/test_request_handler_authorizer.cpp

@@ -110,8 +110,12 @@ class AuthorizerHandlerTests : public Test {
                                                      HasSubstr(expected_beamtime_id),
                                                      HasSubstr(expected_producer_uri),
                                                      HasSubstr(expected_authorization_server))));
+            } else {
+                EXPECT_CALL(mock_logger, Debug(AllOf(HasSubstr("authorized"),
+                                                     HasSubstr(expected_beamtime_id),
+                                                     HasSubstr(expected_beamline),
+                                                     HasSubstr(expected_producer_uri))));
             }
-
         }