Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Updater: Pipe mysql process output into worldserver log

Browse Source
This commit is contained in:
Shauren
2015-09-26 00:24:22 +02:00
parent d71e0660fb
commit 2d109b63e2
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/database/Updater/DBUpdater.cpp
View File

@@ -26,6 +26,8 @@
#include <iostream>
#include <unordered_map>
#include <boost/process.hpp>
#include <boost/iostreams/stream.hpp>
#include <boost/iostreams/copy.hpp>
#include <boost/iostreams/device/file_descriptor.hpp>
#include <boost/system/system_error.hpp>
@@ -423,9 +425,29 @@ void DBUpdater<T>::ApplyFile(DatabaseWorkerPool<T>& pool, std::string const& hos
uint32 ret;
try
{
pipe outPipe = create_pipe();
pipe errPipe = create_pipe();
child c = execute(run_exe(DBUpdater<T>::GetMySqlCli().empty() ? "mysql" :
boost::filesystem::absolute(DBUpdater<T>::GetMySqlCli()).generic_string()),
set_args(args), bind_stdin(source), throw_on_error());
set_args(args), bind_stdin(source), throw_on_error(),
bind_stdout(file_descriptor_sink(outPipe.sink, close_handle)),
bind_stderr(file_descriptor_sink(errPipe.sink, close_handle)));
file_descriptor_source mysqlOutfd(outPipe.source, close_handle);
file_descriptor_source mysqlErrfd(errPipe.source, close_handle);
stream<file_descriptor_source> mysqlOutStream(mysqlOutfd);
stream<file_descriptor_source> mysqlErrStream(mysqlErrfd);
std::stringstream out;
std::stringstream err;
copy(mysqlOutStream, out);
copy(mysqlErrStream, err);
TC_LOG_INFO("sql.updates", "%s", out.str().c_str());
TC_LOG_ERROR("sql.updates", "%s", err.str().c_str());
ret = wait_for_exit(c);
}