From 87b01d8629c53c32c4988f90d4eabe24ae727691 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Thu, 9 Jul 2020 17:07:01 -0400 Subject: [PATCH] add logging --- .drone.yml | 5 +-- Cargo.lock | 110 ++++++++++++++++++++++++++++++++++++++++++++- Cargo.toml | 2 + scripts/release.sh | 2 +- src/main.rs | 2 + 5 files changed, 116 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8997a9d..ac0d578 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,9 +37,8 @@ steps: DIGITALOCEAN_ACCESS_TOKEN: from_secret: DIGITALOCEAN_ACCESS_TOKEN commands: - - nix-env -i -f ./nix/dhall.nix - - cd scripts - - ./release.sh + - nix-env -i -f ./nix/dhall.nix + - ./scripts/release.sh volumes: - name: image diff --git a/Cargo.lock b/Cargo.lock index 0a8f43f..7afd9d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,25 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +[[package]] +name = "aho-corasick" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +dependencies = [ + "memchr", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi", + "libc", + "winapi 0.3.8", +] + [[package]] name = "autocfg" version = "0.1.7" @@ -109,6 +129,19 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" +[[package]] +name = "env_logger" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +dependencies = [ + "atty", + "humantime", + "log 0.4.8", + "regex", + "termcolor", +] + [[package]] name = "fake-simd" version = "0.1.2" @@ -302,6 +335,15 @@ dependencies = [ "http", ] +[[package]] +name = "hermit-abi" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +dependencies = [ + "libc", +] + [[package]] name = "http" version = "0.2.1" @@ -329,6 +371,15 @@ version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +[[package]] +name = "humantime" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" +dependencies = [ + "quick-error", +] + [[package]] name = "hyper" version = "0.13.5" @@ -653,12 +704,24 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" +[[package]] +name = "pretty_env_logger" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" +dependencies = [ + "env_logger", + "log 0.4.8", +] + [[package]] name = "printerfacts" version = "0.1.0" dependencies = [ + "log 0.4.8", "pfacts", - "rand 0.6.5", + "pretty_env_logger", + "rand 0.7.3", "tokio", "warp", ] @@ -861,6 +924,24 @@ version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +[[package]] +name = "regex" +version = "1.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", +] + +[[package]] +name = "regex-syntax" +version = "0.6.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" + [[package]] name = "remove_dir_all" version = "0.5.2" @@ -983,6 +1064,24 @@ dependencies = [ "winapi 0.3.8", ] +[[package]] +name = "termcolor" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +dependencies = [ + "winapi-util", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ + "lazy_static", +] + [[package]] name = "time" version = "0.1.43" @@ -1242,6 +1341,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi 0.3.8", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/Cargo.toml b/Cargo.toml index f509d6a..d4535d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,9 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] +log = "0" pfacts = "0.1.0" +pretty_env_logger = "0" rand = "0" tokio = { version = "0.2", features = ["macros"] } warp = "0.2" diff --git a/scripts/release.sh b/scripts/release.sh index 9012251..9865404 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -p doctl -p kubectl +#! nix-shell -p doctl -p kubectl -i bash doctl kubernetes cluster kubeconfig save kubermemes dhall-to-yaml-ng < ../printerfacts.dhall | kubectl apply -n apps -f - kubectl rollout status -n apps deployment/printerfacts diff --git a/src/main.rs b/src/main.rs index e334396..60e43fa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,6 +9,7 @@ async fn give_fact(facts: Facts) -> Result { #[tokio::main] async fn main() { + pretty_env_logger::init(); let facts = pfacts::make(); let mw = warp::any().map(move || facts.clone()); @@ -17,6 +18,7 @@ async fn main() { .and(mw) .and_then(give_fact); + log::info!("listening on port 5000"); warp::serve(fact_handler) .run(([0, 0, 0, 0], 5000)) .await;