Commit b02db6c7 authored by Pavel Vaynerman's avatar Pavel Vaynerman

fixed bug in uniset-mysql-dbserver

parent 231e7966
......@@ -332,8 +332,11 @@ void DBServer_MySQL::parse( UniSetTypes::SensorMessage *si )
}
//--------------------------------------------------------------------------------------------
void DBServer_MySQL::init()
void DBServer_MySQL::init_dbserver()
{
DBServer::init_dbserver();
unideb[Debug::INFO] << myname << "(init): ..." << endl;
if( connect_ok )
{
initDBTableMap(tblMap);
......@@ -454,7 +457,7 @@ void DBServer_MySQL::timerInfo( UniSetTypes::TimerMessage* tm )
unideb[Debug::WARN] << myname << "(timerInfo): " << endl;
}
else
init();
init_dbserver();
}
break;
......
......@@ -158,8 +158,7 @@ class DBServer_MySQL:
virtual void parse( UniSetTypes::ConfirmMessage* cmsg );
bool writeToBase( const string& query );
virtual void init();
virtual void init_dbserver();
void createTables( DBInterface* db );
inline const char* tblName(int key)
......
#!/bin/sh
ln -s -f /usr/bin/uniset-stop.sh stop.sh
ln -s -f ../../conf/test.xml test.xml
// $Id: main.cc,v 1.8 2008/02/10 03:21:41 vpashka Exp $
// --------------------------------------------------------------------------
#include "Configuration.h"
#include "DBServer.h"
#include "DBServer_MySQL.h"
#include "ObjectsActivator.h"
#include "Debug.h"
// --------------------------------------------------------------------------
......@@ -10,7 +10,7 @@ using namespace std;
// --------------------------------------------------------------------------
static void short_usage()
{
cout << "Usage: uniset-dbserver [--name ObjectId] [--confile configure.xml]\n";
cout << "Usage: uniset-mysql-dbserver [--name ObjectId] [--confile configure.xml]\n";
}
// --------------------------------------------------------------------------
int main(int argc, char** argv)
......@@ -53,7 +53,7 @@ int main(int argc, char** argv)
return 1;
}
DBServer dbs(ID);
DBServer_MySQL dbs(ID);
ObjectsActivator act;
act.addObject(static_cast<class UniSetObject*>(&dbs));
act.run(false);
......
#!/bin/sh
ulimit -Sc 1000000
uniset-start.sh -f ./uniset-mysql-dbserver --confile test.xml --unideb-add-levels info,crit,warn,level9,system
......@@ -103,7 +103,7 @@
textname -
-->
<nodes port="2809">
<item name="LocalhostNode" alias="" textname=" " ip="127.0.0.1" infserver="InfoServer" dbserver=""/>
<item name="LocalhostNode" alias="" textname=" " ip="127.0.0.1" infserver="InfoServer" dbserver="DBServer"/>
<item name="Node2" alias="" textname=" " ip="127.0.0.1" infserver="InfoServer" dbserver=""/>
</nodes>
......
......@@ -69,7 +69,7 @@ class DBServer:
virtual void parse( UniSetTypes::ConfirmMessage* cmsg ){};
virtual bool activateObject();
virtual void init(){};
virtual void init_dbserver(){};
private:
};
......
......@@ -128,8 +128,8 @@ void DBServer::processingMessage( UniSetTypes::VoidMessage *msg )
//--------------------------------------------------------------------------------------------
bool DBServer::activateObject()
{
UniSetObject::activateObject();
init();
UniSetObject_LT::activateObject();
init_dbserver();
return true;
}
//--------------------------------------------------------------------------------------------
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment