Don't warn when there is no debugger startup doc

It's perfectly valid to have no debugger startup doc configured for a server. The code was a bit silly in that case.
Esse commit está contido em:
Mike Magruder
2013-06-20 17:56:05 -07:00
commit de Sara Golemon
commit e3f34ac774
+15 -13
Ver Arquivo
@@ -119,22 +119,24 @@ void DummySandbox::run() {
Debugger::RegisterSandbox(sandbox);
g_context->setSandboxId(sandbox.id());
char cwd[PATH_MAX];
getcwd(cwd, sizeof(cwd));
std::string doc = getStartupDoc(sandbox);
Logger::Info("Start loading startup doc '%s', pwd = '%s'",
doc.c_str(), cwd);
bool error; string errorMsg;
bool ret = hphp_invoke(g_context.getNoCheck(), doc, false, null_array,
uninit_null(), "", "", error, errorMsg, true, false,
true);
if (!ret || error) {
msg += "Unable to pre-load " + doc;
if (!errorMsg.empty()) {
msg += ": " + errorMsg;
if (!doc.empty()) {
char cwd[PATH_MAX];
getcwd(cwd, sizeof(cwd));
Logger::Info("Start loading startup doc '%s', pwd = '%s'",
doc.c_str(), cwd);
bool error; string errorMsg;
bool ret = hphp_invoke(g_context.getNoCheck(), doc, false, null_array,
uninit_null(), "", "", error, errorMsg, true,
false, true);
if (!ret || error) {
msg += "Unable to pre-load " + doc;
if (!errorMsg.empty()) {
msg += ": " + errorMsg;
}
}
Logger::Info("Startup doc " + doc + " loaded");
}
Logger::Info("Startup doc " + doc + " loaded");
} else {
g_context->setSandboxId(m_proxy->getDummyInfo().id());
}