3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-06 21:01:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

string replaced with stream

Browse source
This commit is contained in:
badaix 2015-08-12 22:03:04 +02:00
parent 0cc2c39357
commit d51cb125fc
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
common/log.cpp
View file

@ -44,24 +44,25 @@ std::string Log::Timestamp()
int Log::sync()
{
if (buffer_.length())
if (buffer_.str().length())
{
if (priority_ == kDbg)
#ifdef DEBUG_LOG
std::cout << Timestamp() << " [dbg] " << buffer_.c_str() << std::flush;
std::cout << Timestamp() << " [dbg] " << buffer_.str() << std::flush;
#else
;
#endif
else if (priority_ == kOut)
std::cout << Timestamp() << " [out] " << buffer_.c_str() << std::flush;
std::cout << Timestamp() << " [out] " << buffer_.str() << std::flush;
else if (priority_ == kErr)
std::cout << Timestamp() << " [err] " << buffer_.c_str() << std::flush;
std::cout << Timestamp() << " [err] " << buffer_.str() << std::flush;
else
{
std::cout << Timestamp() << " [" << std::to_string(priority_) << "] " << buffer_.c_str() << std::flush;
syslog(priority_, "%s", buffer_.c_str());
std::cout << Timestamp() << " [" << std::to_string(priority_) << "] " << buffer_.str() << std::flush;
syslog(priority_, "%s", buffer_.str().c_str());
}
buffer_.erase();
buffer_.str("");
buffer_.clear();
priority_ = kLogDebug; // default to debug for each message
}
return 0;
@ -72,7 +73,7 @@ int Log::overflow(int c)
{
if (c != EOF)
{
buffer_ += static_cast<char>(c);
buffer_ << static_cast<char>(c);
if (c == '\n')
sync();
}

3
common/log.h
View file

@ -23,6 +23,7 @@
#include <syslog.h>
#include <iostream>
#include <cstring>
#include <sstream>
#define logD std::clog << kDbg
#define logO std::clog << kOut
@ -57,7 +58,7 @@ protected:
private:
friend std::ostream& operator<< (std::ostream& os, const LogPriority& log_priority);
std::string Timestamp();
std::string buffer_;
std::stringstream buffer_;
int facility_;
LogPriority priority_;
char ident_[50];