summaryrefslogtreecommitdiff
path: root/cli/ops/os.rs
diff options
context:
space:
mode:
authorBartek IwaƄczuk <biwanczuk@gmail.com>2019-11-04 16:38:52 +0100
committerRy Dahl <ry@tinyclouds.org>2019-11-04 10:38:52 -0500
commit0049d4e50c9dd945f25f69b08b08fbf492001f96 (patch)
tree3bcf3c50bdba9abba6b1b8ff9340f76fc19f759c /cli/ops/os.rs
parent429439d1983269ba40141a1b42f6ac809d1e8c86 (diff)
Refactor Worker and ThreadSafeState (#3242)
* Split ThreadSafeState into State and GlobalState. State is a "local" state belonging to "Worker" while "GlobalState" is state shared by whole program. * Update "Worker" and ops to use "GlobalState" where applicable * Move and refactor "WorkerChannels" resource
Diffstat (limited to 'cli/ops/os.rs')
-rw-r--r--cli/ops/os.rs14
1 files changed, 6 insertions, 8 deletions
diff --git a/cli/ops/os.rs b/cli/ops/os.rs
index c50b8eedb..78fd940de 100644
--- a/cli/ops/os.rs
+++ b/cli/ops/os.rs
@@ -7,7 +7,6 @@ use crate::state::ThreadSafeState;
use crate::version;
use atty;
use deno::*;
-use log;
use std::collections::HashMap;
use std::env;
use sys_info;
@@ -40,16 +39,15 @@ fn op_start(
_args: Value,
_zero_copy: Option<PinnedBuf>,
) -> Result<JsonOp, ErrBox> {
+ let gs = &state.global_state;
+
Ok(JsonOp::Sync(json!({
"cwd": deno_fs::normalize_path(&env::current_dir().unwrap()),
"pid": std::process::id(),
- "argv": state.argv,
- "mainModule": state.main_module().map(|x| x.as_str().to_string()),
- "debugFlag": state
- .flags
- .log_level
- .map_or(false, |l| l == log::Level::Debug),
- "versionFlag": state.flags.version,
+ "argv": gs.argv,
+ "mainModule": gs.main_module.as_ref().map(|x| x.to_string()),
+ "debugFlag": gs.flags.log_level.map_or(false, |l| l == log::Level::Debug),
+ "versionFlag": gs.flags.version,
"v8Version": version::v8(),
"denoVersion": version::DENO,
"tsVersion": version::TYPESCRIPT,