Reuse Log method
This commit is contained in:
parent
d686916fe2
commit
0740b2f66b
3 changed files with 11 additions and 13 deletions
|
@ -4,11 +4,10 @@
|
||||||
|
|
||||||
#include "atom/app/node_main.h"
|
#include "atom/app/node_main.h"
|
||||||
|
|
||||||
#include <iostream>
|
|
||||||
|
|
||||||
#include "atom/app/uv_task_runner.h"
|
#include "atom/app/uv_task_runner.h"
|
||||||
#include "atom/browser/javascript_environment.h"
|
#include "atom/browser/javascript_environment.h"
|
||||||
#include "atom/browser/node_debugger.h"
|
#include "atom/browser/node_debugger.h"
|
||||||
|
#include "atom/common/api/atom_bindings.h"
|
||||||
#include "atom/common/native_mate_converters/string16_converter.h"
|
#include "atom/common/native_mate_converters/string16_converter.h"
|
||||||
#include "base/command_line.h"
|
#include "base/command_line.h"
|
||||||
#include "base/feature_list.h"
|
#include "base/feature_list.h"
|
||||||
|
@ -22,10 +21,6 @@
|
||||||
|
|
||||||
namespace atom {
|
namespace atom {
|
||||||
|
|
||||||
void Log(const base::string16& message) {
|
|
||||||
std::cout << message << std::flush;
|
|
||||||
}
|
|
||||||
|
|
||||||
int NodeMain(int argc, char *argv[]) {
|
int NodeMain(int argc, char *argv[]) {
|
||||||
base::CommandLine::Init(argc, argv);
|
base::CommandLine::Init(argc, argv);
|
||||||
|
|
||||||
|
@ -59,10 +54,10 @@ int NodeMain(int argc, char *argv[]) {
|
||||||
if (node_debugger.IsRunning())
|
if (node_debugger.IsRunning())
|
||||||
env->AssignToContext(v8::Debug::GetDebugContext());
|
env->AssignToContext(v8::Debug::GetDebugContext());
|
||||||
|
|
||||||
node::LoadEnvironment(env);
|
mate::Dictionary process(gin_env.isolate(), env->process_object());
|
||||||
|
process.SetMethod("log", &AtomBindings::Log);
|
||||||
|
|
||||||
mate::Dictionary dict(gin_env.isolate(), env->process_object());
|
node::LoadEnvironment(env);
|
||||||
dict.SetMethod("log", &Log);
|
|
||||||
|
|
||||||
bool more;
|
bool more;
|
||||||
do {
|
do {
|
||||||
|
|
|
@ -79,10 +79,6 @@ void FatalErrorCallback(const char* location, const char* message) {
|
||||||
Crash();
|
Crash();
|
||||||
}
|
}
|
||||||
|
|
||||||
void Log(const base::string16& message) {
|
|
||||||
std::cout << message << std::flush;
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
|
||||||
|
@ -157,4 +153,9 @@ void AtomBindings::OnCallNextTick(uv_async_t* handle) {
|
||||||
self->pending_next_ticks_.clear();
|
self->pending_next_ticks_.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// static
|
||||||
|
void AtomBindings::Log(const base::string16& message) {
|
||||||
|
std::cout << message << std::flush;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace atom
|
} // namespace atom
|
||||||
|
|
|
@ -27,6 +27,8 @@ class AtomBindings {
|
||||||
// load native code from Electron instead.
|
// load native code from Electron instead.
|
||||||
void BindTo(v8::Isolate* isolate, v8::Local<v8::Object> process);
|
void BindTo(v8::Isolate* isolate, v8::Local<v8::Object> process);
|
||||||
|
|
||||||
|
static void Log(const base::string16& message);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void ActivateUVLoop(v8::Isolate* isolate);
|
void ActivateUVLoop(v8::Isolate* isolate);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue