mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-01-24 05:14:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge with upstream

Browse Source
This commit is contained in:
Oran Juice
2015-01-17 13:29:07 +05:30
parent 81b2a49c6e 9e0516c1dd
commit 8d4df7d240
7 changed files with 124 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/daemon/daemon.cpp
View File

@@ -246,8 +246,8 @@ int main(int argc, char* argv[])
CHECK_AND_ASSERT_MES(res, 1, "Failed to initialize protocol.");
LOG_PRINT_L0("Protocol initialized OK");
// LOG_PRINT_L0("Initializing core IPC server...");
// IPC::Daemon::init(&ccore, &p2psrv);
LOG_PRINT_L0("Initializing core IPC server...");
IPC::Daemon::init(&ccore, &p2psrv);
LOG_PRINT_L0("Initializing core RPC server...");
RPC::Daemon::init(&ccore, &p2psrv, testnet_mode);
std::string ip_address, port;