use factory for sockets

This commit is contained in:
Alexey Rybalchenko
2014-01-21 15:57:59 +01:00
parent a383434c45
commit 88fee245b8
38 changed files with 653 additions and 493 deletions

View File

@@ -5,10 +5,11 @@
* @author D. Klein, A. Rybalchenko
*/
#include "FairMQLogger.h"
#include <iostream>
#include <ctime>
#include <iomanip>
#include <ctime>
#include "FairMQLogger.h"
FairMQLogger* FairMQLogger::instance = NULL;
@@ -21,7 +22,7 @@ FairMQLogger* FairMQLogger::GetInstance()
return instance;
}
FairMQLogger* FairMQLogger::InitInstance(TString bindAddress)
FairMQLogger* FairMQLogger::InitInstance(std::string bindAddress)
{
instance = new FairMQLogger(bindAddress);
return instance;
@@ -32,7 +33,7 @@ FairMQLogger::FairMQLogger() :
{
}
FairMQLogger::FairMQLogger(TString bindAddress) :
FairMQLogger::FairMQLogger(std::string bindAddress) :
fBindAddress(bindAddress)
{
}
@@ -41,31 +42,31 @@ FairMQLogger::~FairMQLogger()
{
}
void FairMQLogger::Log(Int_t type, TString logmsg)
void FairMQLogger::Log(int type, std::string logmsg)
{
timestamp_t tm = get_timestamp();
timestamp_t ms = tm / 1000.0L;
timestamp_t s = ms / 1000.0L;
std::time_t t = s;
std::size_t fractional_seconds = ms % 1000;
Text_t mbstr[100];
char mbstr[100];
std::strftime(mbstr, 100, "%H:%M:%S:", std::localtime(&t));
TString type_str;
std::string type_str;
switch (type) {
case DEBUG:
type_str = "\033[01;34mDEBUG\033[0m";
break;
case INFO:
type_str = "\033[01;32mINFO\033[0m";
break;
case ERROR:
type_str = "\033[01;31mERROR\033[0m";
break;
case STATE:
type_str = "\033[01;33mSTATE\033[0m";
default:
break;
case DEBUG:
type_str = "\033[01;34mDEBUG\033[0m";
break;
case INFO:
type_str = "\033[01;32mINFO\033[0m";
break;
case ERROR:
type_str = "\033[01;31mERROR\033[0m";
break;
case STATE:
type_str = "\033[01;33mSTATE\033[0m";
default:
break;
}
std::cout << "[\033[01;36m" << mbstr << fractional_seconds << "\033[0m]" << "[" << type_str << "]" << " " << logmsg << std::endl;