Skip to content

Adapt LockedSqw to upstream changes in sqlwriter #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wandernauta wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Adapt LockedSqw to upstream changes in sqlwriter #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sws.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ struct LockedSqw
return packResultsJson(result);
}

void addValue(const std::initializer_list<std::pair<const char*, SQLiteWriter::var_t>>& values, const std::string& table="data")
void addValue(const std::initializer_list<std::pair<std::string, SQLiteWriter::var_t>>& values, const std::string& table="data")
{
std::lock_guard<std::mutex> l(sqwlock);
sqw.addValue(values, table);
}
void addValue(const std::vector<std::pair<const char*, SQLiteWriter::var_t>>& values, const std::string& table="data")
void addValue(const std::vector<std::pair<std::string, SQLiteWriter::var_t>>& values, const std::string& table="data")
{
std::lock_guard<std::mutex> l(sqwlock);
sqw.addValue(values, table);
Expand Down Expand Up @@ -117,10 +117,10 @@ struct SimpleWebSystem
{
return sws.getIP(req);
}
void log(const std::initializer_list<std::pair<const char*, SQLiteWriter::var_t>>& fields)
void log(const std::initializer_list<std::pair<std::string, SQLiteWriter::var_t>>& fields)
{
// add agent?
std::vector<std::pair<const char*, SQLiteWriter::var_t>> values{{"user", user}, {"ip", getIP()}, {"tstamp", time(0)}};
std::vector<std::pair<std::string, SQLiteWriter::var_t>> values{{"user", user}, {"ip", getIP()}, {"tstamp", time(0)}};
for(const auto& f : fields)
values.push_back(f);
lsqw.addValue(values, "log");
Expand Down
Loading