(DBServer): добавил отладочную информацию

extensions/DBServer-MySQL/DBServer_MySQL.cc

@@ -427,3 +427,22 @@ void DBServer_MySQL::help_print( int argc, const char* const* argv )
 	cout << DBServer::help_print() << endl;
 }
 // -----------------------------------------------------------------------------
+std::string DBServer_MySQL::getMonitInfo( const std::string& params )
+{
+	ostringstream inf;
+
+	inf << "Database: "
+		<< "[ ping=" << PingTime
+		<< " reconnect=" << ReconnectTime
+		<< " qbufSize=" << qbufSize
+		<< " ]" << endl
+		<< "  connection: " << (connect_ok ? "OK" : "FAILED") << endl;
+	{
+		uniset_rwmutex_rlock lock(mqbuf);
+		inf << " buffer size: " << qbuf.size() << endl;
+	}
+	inf << "   lastError: " << db->error() << endl;
+
+	return inf.str();
+}
+// -----------------------------------------------------------------------------

extensions/DBServer-MySQL/DBServer_MySQL.h

@@ -168,6 +168,7 @@ namespace uniset
 			virtual void sysCommand( const uniset::SystemMessage* sm ) override;
 			virtual void sensorInfo( const uniset::SensorMessage* sm ) override;
 			virtual void confirmInfo( const uniset::ConfirmMessage* cmsg ) override;
+			virtual std::string getMonitInfo( const std::string& params ) override;
 
 			bool writeToBase( const std::string& query );
 			void createTables( MySQLInterface* db );
@@ -184,7 +185,6 @@ namespace uniset
 				lastNumberOfTimer
 			};
 
-
 			std::unique_ptr<MySQLInterface> db;
 			int PingTime = { 15000 };
 			int ReconnectTime = { 30000 };

extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.cc

@@ -464,6 +464,31 @@ bool DBServer_PostgreSQL::deactivateObject()
 	return DBServer::deactivateObject();
 }
 //--------------------------------------------------------------------------------------------
+string DBServer_PostgreSQL::getMonitInfo( const string& params )
+{
+	ostringstream inf;
+
+	inf << "Database: "
+		<< "[ ping=" << PingTime
+		<< " reconnect=" << ReconnectTime
+		<< " qbufSize=" << qbufSize
+		<< " ]" << endl
+		<< "  connection: " << (connect_ok ? "OK" : "FAILED") << endl;
+	{
+		std::lock_guard<std::mutex> lock(mqbuf);
+		inf << " buffer size: " << qbuf.size() << endl;
+	}
+	inf << "   lastError: " << db->error() << endl;
+
+	inf	<< "Insert buffer: "
+		<< "[ ibufMaxSize=" << ibufMaxSize
+		<< " ibufSize=" << ibufSize
+		<< " ibufSyncTimeout=" << ibufSyncTimeout
+		<< " ]"	<< endl;
+
+	return inf.str();
+}
+//--------------------------------------------------------------------------------------------
 std::shared_ptr<DBServer_PostgreSQL> DBServer_PostgreSQL::init_dbserver( int argc, const char* const* argv,
 		const std::string& prefix )
 {

extensions/DBServer-PostgreSQL/DBServer_PostgreSQL.h

@@ -86,6 +86,7 @@ namespace uniset
 			virtual void sensorInfo( const uniset::SensorMessage* sm ) override;
 			virtual void confirmInfo( const uniset::ConfirmMessage* cmsg ) override;
 			virtual bool deactivateObject() override;
+			virtual std::string getMonitInfo( const std::string& params ) override;
 
 			bool writeToBase( const std::string& query );
 			void createTables( std::shared_ptr<PostgreSQLInterface>& db );

extensions/DBServer-PostgreSQL/Makefile.am

@@ -27,4 +27,6 @@ devel_includedir = $(includedir)/@PACKAGE@/extensions/pgsql
 pkgconfigdir    = $(libdir)/pkgconfig
 pkgconfig_DATA  = libUniSet2PostgreSQL.pc
 
+include $(top_builddir)/include.mk
+
 endif

extensions/DBServer-SQLite/DBServer_SQLite.cc

@@ -401,3 +401,22 @@ void DBServer_SQLite::help_print( int argc, const char* const* argv )
 	cout << DBServer::help_print() << endl;
 }
 // -----------------------------------------------------------------------------
+std::string DBServer_SQLite::getMonitInfo( const std::string& params )
+{
+	ostringstream inf;
+
+	inf << "Database: "
+		<< "[ ping=" << PingTime
+		<< " reconnect=" << ReconnectTime
+		<< " qbufSize=" << qbufSize
+		<< " ]" << endl
+		<< "  connection: " << (connect_ok ? "OK" : "FAILED") << endl;
+	{
+		uniset_rwmutex_rlock lock(mqbuf);
+		inf << " buffer size: " << qbuf.size() << endl;
+	}
+	inf << "   lastError: " << db->error() << endl;
+
+	return inf.str();
+}
+// -----------------------------------------------------------------------------

extensions/DBServer-SQLite/DBServer_SQLite.h

@@ -168,6 +168,7 @@ namespace uniset
 			virtual void sysCommand( const uniset::SystemMessage* sm ) override;
 			virtual void sensorInfo( const uniset::SensorMessage* sm ) override;
 			virtual void confirmInfo( const uniset::ConfirmMessage* cmsg ) override;
+			virtual std::string getMonitInfo( const std::string& params ) override;
 
 			bool writeToBase( const std::string& query );
 			void createTables( SQLiteInterface* db );

include/DBServer.h

@@ -58,6 +58,8 @@ namespace uniset
 
 			static std::string help_print();
 
+			virtual uniset::SimpleInfo* getInfo( const char* userparam = "" ) override;
+
 		protected:
 
 			virtual void processingMessage( const uniset::VoidMessage* msg ) override;
@@ -65,7 +67,8 @@ namespace uniset
 			virtual void confirmInfo( const uniset::ConfirmMessage* cmsg ) {}
 
 			virtual bool activateObject() override;
-			virtual void initDBServer() {};
+			virtual void initDBServer() {}
+			virtual std::string getMonitInfo( const std::string& params ){ return ""; }
 
 
 			std::shared_ptr<LogAgregator> loga;

src/Services/DBServer.cc

@@ -141,3 +141,12 @@ std::string DBServer::help_print()
 	return h.str();
 }
 //--------------------------------------------------------------------------------------------
+SimpleInfo* DBServer::getInfo( const char* userparam )
+{
+	uniset::SimpleInfo_var i = UniSetObject::getInfo(userparam);
+
+	const std::string inf = getMonitInfo( std::string(userparam) );
+	i->info = inf.c_str();
+	return i._retn();
+}
+//--------------------------------------------------------------------------------------------