This is an automated email from the ASF dual-hosted git repository.
yangjiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-ballista.git
The following commit(s) were added to refs/heads/main by this push:
new d5a55005 Disable the ansi feature of tracing-subscriber (#784)
d5a55005 is described below
commit d5a55005f6fbd81b2078c63e925096173a66643f
Author: yahoNanJing <[email protected]>
AuthorDate: Mon May 29 11:05:06 2023 +0800
Disable the ansi feature of tracing-subscriber (#784)
Co-authored-by: yangzhong <[email protected]>
---
Cargo.toml | 3 +++
ballista/executor/Cargo.toml | 10 +++-------
ballista/executor/src/executor_process.rs | 4 ++--
ballista/scheduler/Cargo.toml | 10 +++-------
ballista/scheduler/src/bin/main.rs | 4 ++--
5 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index d1536c9a..75986d3e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,6 +30,9 @@ object_store = "0.5.6"
sqlparser = "0.33.0"
tonic = { version = "0.9" }
tonic-build = { version = "0.9", default-features = false, features =
["transport", "prost"] }
+tracing = "0.1.36"
+tracing-appender = "0.2.2"
+tracing-subscriber = { version = "0.3.15", features = ["env-filter"] }
# cargo build --profile release-lto
[profile.release-lto]
diff --git a/ballista/executor/Cargo.toml b/ballista/executor/Cargo.toml
index 65568d82..a645b433 100644
--- a/ballista/executor/Cargo.toml
+++ b/ballista/executor/Cargo.toml
@@ -63,13 +63,9 @@ tokio = { version = "1.0", features = [
] }
tokio-stream = { version = "0.1", features = ["net"] }
tonic = { workspace = true }
-tracing = "0.1.36"
-tracing-appender = "0.2.2"
-tracing-subscriber = { version = "0.3.15", features = [
- "fmt",
- "env-filter",
- "ansi",
-] }
+tracing = { workspace = true }
+tracing-appender = { workspace = true }
+tracing-subscriber = { workspace = true }
uuid = { version = "1.0", features = ["v4"] }
[dev-dependencies]
diff --git a/ballista/executor/src/executor_process.rs
b/ballista/executor/src/executor_process.rs
index 6aea9b6e..df19bb14 100644
--- a/ballista/executor/src/executor_process.rs
+++ b/ballista/executor/src/executor_process.rs
@@ -108,7 +108,7 @@ pub async fn start_executor_process(opt:
ExecutorProcessConfig) -> Result<()> {
}
};
tracing_subscriber::fmt()
- .with_ansi(true)
+ .with_ansi(false)
.with_thread_names(opt.print_thread_info)
.with_thread_ids(opt.print_thread_info)
.with_writer(log_file)
@@ -117,7 +117,7 @@ pub async fn start_executor_process(opt:
ExecutorProcessConfig) -> Result<()> {
} else {
// Console layer
tracing_subscriber::fmt()
- .with_ansi(true)
+ .with_ansi(false)
.with_thread_names(opt.print_thread_info)
.with_thread_ids(opt.print_thread_info)
.with_writer(io::stdout)
diff --git a/ballista/scheduler/Cargo.toml b/ballista/scheduler/Cargo.toml
index 30709989..ece67440 100644
--- a/ballista/scheduler/Cargo.toml
+++ b/ballista/scheduler/Cargo.toml
@@ -76,13 +76,9 @@ tokio = { version = "1.0", features = ["full"] }
tokio-stream = { version = "0.1", features = ["net"], optional = true }
tonic = { workspace = true }
tower = { version = "0.4" }
-tracing = "0.1.36"
-tracing-appender = "0.2.2"
-tracing-subscriber = { version = "0.3.15", features = [
- "fmt",
- "env-filter",
- "ansi",
-] }
+tracing = { workspace = true }
+tracing-appender = { workspace = true }
+tracing-subscriber = { workspace = true }
uuid = { version = "1.0", features = ["v4"] }
warp = "0.3"
diff --git a/ballista/scheduler/src/bin/main.rs
b/ballista/scheduler/src/bin/main.rs
index 44ff79d8..6473795f 100644
--- a/ballista/scheduler/src/bin/main.rs
+++ b/ballista/scheduler/src/bin/main.rs
@@ -83,7 +83,7 @@ async fn main() -> Result<()> {
}
};
tracing_subscriber::fmt()
- .with_ansi(true)
+ .with_ansi(false)
.with_thread_names(print_thread_info)
.with_thread_ids(print_thread_info)
.with_writer(log_file)
@@ -92,7 +92,7 @@ async fn main() -> Result<()> {
} else {
// Console layer
tracing_subscriber::fmt()
- .with_ansi(true)
+ .with_ansi(false)
.with_thread_names(print_thread_info)
.with_thread_ids(print_thread_info)
.with_writer(io::stdout)