backported to p9 as 2.10.1-alt0.M90P.1 (with rpmbph script)

conf/libuniset2.spec

@@ -26,8 +26,8 @@
 %define oname uniset2
 
 Name: libuniset2
-Version: 2.9.4
-Release: alt0.M90P.0.7
+Version: 2.10.1
+Release: alt0.M90P.1
 Summary: UniSet - library for building distributed industrial control systems
 
 License: LGPL-2.1
@@ -589,9 +589,12 @@ rm -f %buildroot%_docdir/%oname/html/*.md5
 # history of current unpublished changes
 
 %changelog
-* Thu Apr 01 2021 Pavel Vainerman <pv@altlinux.ru> 2.9.4-alt0.M90P.0.7
+* Sat May 08 2021 Pavel Vainerman <pv@altlinux.ru> 2.10.1-alt0.M90P.1
 - backport to ALTLinux p9 (by rpmbph script)
 
+* Sat May 08 2021 Pavel Vainerman <pv@altlinux.ru> 2.10.1-alt1
+- new release
+
 * Thu Apr 01 2021 Pavel Vainerman <pv@altlinux.ru> 2.9.4-alt0.7
 - test build
 

configure.ac

@@ -3,10 +3,10 @@
 # See doc: http://www.gnu.org/software/hello/manual/autoconf/Generic-Programs.html
 
 # AC_PREREQ(2.59)
-AC_INIT([uniset2], [2.9.3], pv@etersoft.ru)
+AC_INIT([uniset2], [2.10.1], pv@etersoft.ru)
 AM_INIT_AUTOMAKE
 
-LIBVER=11:3:9
+LIBVER=12:1:10
 AC_SUBST(LIBVER)
 
 # AC_CONFIG_MACRO_DIR([m4])

extensions/UWebSocketGate/UWebSocketGateSugar.h

@@ -4,6 +4,12 @@
 #ifndef myinfo
 #define myinfo if( mylog->debugging(Debug::INFO) ) mylog->info()
 #endif
+<<<<<<< HEAD
+=======
+#ifndef myinfoV
+#define myinfoV(N) if( mylog->debugging(Debug::INFO) ) mylog->V(N)[Debug::INFO]
+#endif
+>>>>>>> 2.10.1-alt1
 #ifndef mywarn
 #define mywarn if( mylog->debugging(Debug::WARN) ) mylog->warn()
 #endif

extensions/UWebSocketGate/start_fg.sh

@@ -2,4 +2,8 @@
 
 ulimit -Sc 1000000
 
+<<<<<<< HEAD
 uniset2-start.sh -f ./uniset2-wsgate --confile test.xml --ws-name UWebSocketGate1 --ws-log-add-levels any $*
+=======
+uniset2-start.sh -f ./uniset2-wsgate --confile test.xml --ws-name UWebSocketGate1 --ws-log-add-levels any --ws-log-verbosity 5 $*
+>>>>>>> 2.10.1-alt1

src/Core/Configuration.cc

@@ -67,6 +67,7 @@ std::string uniset::Configuration::help()
 	print_help(os, 25, "--ulog-show-milliseconds", "Выводить время с миллисекундами\n");
 	print_help(os, 25, "--ulog-no-debug", "отключение логов\n");
 	print_help(os, 25, "--ulog-logfile", "перенаправление лога в файл\n");
+	print_help(os, 25, "--ulog-levels N", "уровень 'говорливости' логов");
 	return os.str();
 }
 // -------------------------------------------------------------------------
@@ -1025,6 +1026,7 @@ namespace uniset
 		string del_level("--" + debname + "-del-levels");
 		string show_msec("--" + debname + "-show-milliseconds");
 		string show_usec("--" + debname + "-show-microseconds");
+		string verb_level("--" + debname + "-verbosity");
 
 		// смотрим командную строку
 		for (int i = 1; i < (_argc - 1); i++)
@@ -1049,6 +1051,10 @@ namespace uniset
 			{
 				deb->showMilliseconds(true);
 			}
+			else if( verb_level == _argv[i] )
+			{
+				deb->verbose(uniset::uni_atoi(_argv[i+1]));
+			}
 		}
 
 		if( !debug_file.empty() )