bound to cumbia 2.0

meson.build

-project('caserver-proxy', 'cpp', version : '1.0.1',
+project('caserver-proxy', 'cpp', version : '1.1.0',
     default_options : ['c_std=c17', 'cpp_std=c++17'])
 
 project_description = 'Keep a record for each active client of the caserver service'
@@ -6,13 +6,13 @@ project_description = 'Keep a record for each active client of the caserver serv
 srv_version = meson.project_version() # set in project()
 
 # enable pinfo cuprintf
-cpp_arguments = [ '-DCUMBIA_DEBUG_OUTPUT=1', '-D__CAREGISTRAR_VERSION__="' + srv_version + '"' ]
+cpp_arguments = [ '-DCUMBIA_DEBUG_OUTPUT=1', '-D__CAPROXY_VERSION__="' + srv_version + '"' ]
 link_arguments = []
 
 openssldep = dependency('openssl')
 curldep = dependency('libcurl')
 # for activities / threads
-cumbiadep = dependency('cumbia', version: '>=1.4.0')
+cumbiadep = dependency('cumbia', version: '>=2.0.0')
 systemd_dep = dependency('systemd')
 caserverlib_dep = dependency('caserver-lib')
 

src/config.h

 #ifndef CONFIG_H
 #define CONFIG_H
-#define CAREGISTRAR_VERSION  __CAREGISTRAR_VERSION__
+#define CAPROXY_VERSION  __CAPROXY_VERSION__
 
 #endif // CONFIG_H

src/main.cpp

@@ -85,7 +85,7 @@ int main(int argc, char *argv[]) {
     if(log_i) log = new CuLog(log_i);
     // end logging setup
 
-    log->write("main.cpp", "enter: " + std::string(argv[0]) + " version " + std::string(CAREGISTRAR_VERSION), CuLog::LevelAll);
+    log->write("main.cpp", "enter: " + std::string(argv[0]) + " version " + std::string(CAPROXY_VERSION), CuLog::LevelAll);
 
     if(getuid() == 0 && !opts.containsKey("user")) {
         log_i->write("main.cpp", "cannot run as root and \"-s username\" command line argument missing", CuLog::LevelError);
@@ -143,7 +143,7 @@ int main(int argc, char *argv[]) {
     if(!opts.containsKey("supervisor-server-address") || !opts.containsKey("supervisor-server-port"))
         printf("\e[1;33m # \e[0mmain.cpp: supervisor-server-address and supervisor-server-port options missing: will not use ca-supervisor\n");
 
-    printf("\e[1;32m # \e[0mmain.cpp: \e[1;32mca-proxy version \e[2;32m%s\e[0m started\n", CAREGISTRAR_VERSION);
+    printf("\e[1;32m # \e[0mmain.cpp: \e[1;32mca-proxy version \e[2;32m%s\e[0m started\n", CAPROXY_VERSION);
     loo_s->exec();
     printf("leaving loop\n");
     if(proxy_proc) {