aboutsummaryrefslogtreecommitdiff
path: root/src/daemon
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-12-31 17:09:00 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2015-12-31 17:09:00 +0000
commit1e07110a7aabf7374f1b1197a1fbbac614acb386 (patch)
treef6cf40d5849796c19f27792390e979539bace840 /src/daemon
parentMerge pull request #584 (diff)
downloadmonero-1e07110a7aabf7374f1b1197a1fbbac614acb386.tar.xz
Nicer looking exit when blockchain.bin is found
Do not print the exception message, and write the important bit in red, since people will only read the last line otherwise.
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/core.h5
-rw-r--r--src/daemon/daemon.cpp3
2 files changed, 5 insertions, 3 deletions
diff --git a/src/daemon/core.h b/src/daemon/core.h
index ea76289dd..2208ef25a 100644
--- a/src/daemon/core.h
+++ b/src/daemon/core.h
@@ -66,15 +66,16 @@ public:
m_core.set_cryptonote_protocol(&protocol);
}
- void run()
+ bool run()
{
//initialize core here
LOG_PRINT_L0("Initializing core...");
if (!m_core.init(m_vm_HACK))
{
- throw std::runtime_error("Failed to initialize core");
+ return false;
}
LOG_PRINT_L0("Core initialized OK");
+ return true;
}
cryptonote::core & get()
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp
index 6093ecdf8..ed6a66722 100644
--- a/src/daemon/daemon.cpp
+++ b/src/daemon/daemon.cpp
@@ -118,7 +118,8 @@ bool t_daemon::run(bool interactive)
try
{
- mp_internals->core.run();
+ if (!mp_internals->core.run())
+ return false;
mp_internals->rpc.run();
daemonize::t_command_server* rpc_commands;