Merge b352184dc6 into 8f17a7ad72

Fix metrics config deser (#245 )
add docker support
2025-04-04 15:35:18 +00:00 · 2024-10-22 14:14:56 +08:00 · 2024-10-22 14:14:33 +08:00 · 2024-10-18 16:29:02 +08:00
7 changed files with 18 additions and 5 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -4715,9 +4715,10 @@ dependencies = [
 [[package]]
 name = "metrics"
 version = "0.1.0"
-source = "git+https://github.com/Conflux-Chain/conflux-rust.git?rev=992ebc5483d937c8f6b883e266f8ed2a67a7fa9a#992ebc5483d937c8f6b883e266f8ed2a67a7fa9a"
+source = "git+https://github.com/Conflux-Chain/conflux-rust.git?rev=c4734e337c66d38e6396742cd5117b596e8d2603#c4734e337c66d38e6396742cd5117b596e8d2603"
 dependencies = [
 "chrono",
+ "duration-str",
 "futures",
 "influx_db_client",
 "lazy_static",
--- a/Cargo.toml
+++ b/Cargo.toml
@ -28,7 +28,7 @@ members = [
 resolver = "2"

 [workspace.dependencies]
-metrics = { git = "https://github.com/Conflux-Chain/conflux-rust.git", rev = "992ebc5483d937c8f6b883e266f8ed2a67a7fa9a" }
+metrics = { git = "https://github.com/Conflux-Chain/conflux-rust.git", rev = "c4734e337c66d38e6396742cd5117b596e8d2603" }

 [patch.crates-io]
 discv5 = { path = "version-meld/discv5" }
--- a/6
+++ b/6
@ -0,0 +1,6 @@
+FROM rust
+VOLUME ["/data"]
+COPY . .
+RUN apt-get update && apt-get install -y clang cmake build-essential pkg-config libssl-dev
+RUN cargo build --release
+CMD ["./target/release/zgs_node", "--config", "run/config-testnet-standard.toml", "--log", "run/log_config"]
--- a/6
+++ b/6
@ -0,0 +1,6 @@
+FROM rust
+VOLUME ["/data"]
+COPY . .
+RUN apt-get update && apt-get install -y clang cmake build-essential pkg-config libssl-dev
+RUN cargo build --release
+CMD ["./target/release/zgs_node", "--config", "run/config-testnet-turbo.toml", "--log", "run/log_config"]
--- a/run/config-testnet-standard.toml
+++ b/run/config-testnet-standard.toml
@ -324,7 +324,7 @@ auto_sync_enabled = true
 # enabled = false

 # Interval to output metrics periodically, e.g. "10s", "30s" or "60s".
-# report_interval = ""
+# report_interval = "10s"

 # File name to output metrics periodically.
 # file_report_output = ""
--- a/run/config-testnet-turbo.toml
+++ b/run/config-testnet-turbo.toml
@ -336,7 +336,7 @@ auto_sync_enabled = true
 # enabled = false

 # Interval to output metrics periodically, e.g. "10s", "30s" or "60s".
-# report_interval = ""
+# report_interval = "10s"

 # File name to output metrics periodically.
 # file_report_output = ""
--- a/run/config.toml
+++ b/run/config.toml
@ -338,7 +338,7 @@
 # enabled = false

 # Interval to output metrics periodically, e.g. "10s", "30s" or "60s".
-# report_interval = ""
+# report_interval = "10s"

 # File name to output metrics periodically.
 # file_report_output = ""
Author	SHA1	Message	Date
0g-peterzhb	be84b7952b	Merge `b352184dc6` into `8f17a7ad72`	2024-10-22 14:14:56 +08:00
Bo QIU	8f17a7ad72	Fix metrics config deser (#245 ) Some checks failed abi-consistent-check / build-and-compare (push) Has been cancelled Details code-coverage / unittest-cov (push) Has been cancelled Details rust / check (push) Has been cancelled Details rust / test (push) Has been cancelled Details rust / lints (push) Has been cancelled Details functional-test / test (push) Has been cancelled Details	2024-10-22 14:14:33 +08:00
Peter Zhang	b352184dc6	add docker support	2024-10-18 16:29:02 +08:00