Logging

Author: jonas-schievink

Cargo.lock

@@ -1,18 +1,23 @@
 [package]
+authors = ["The Rust Project Developers"]
 name = "rust-playpen"
 version = "0.1.0"
-authors = ["The Rust Project Developers"]
 
 [dependencies]
+env_logger = "0.3.3"
+hyper = "0.8.1"
 iron = "0.3.0"
-hyper = "0.8.1" # same version iron uses
-url = "1.1.1"
-router = "0.1.1"
-staticfile = "0.2.0"
 libc = "0.2.12"
-unicase = "1.4.0"
+log = "0.3.6"
+lru-cache = "0.0.7"
+router = "0.1.1"
 rustc-serialize = "0.3.19"
-toml = "0.1.30"
 serde_json = "0.7.1"
-lru-cache = "0.0.7"
-irc = { version = "0.11.3", default-features = false }
+staticfile = "0.2.0"
+toml = "0.1.30"
+unicase = "1.4.0"
+url = "1.1.1"
+
+[dependencies.irc]
+default-features = false
+version = "0.11.3"

Cargo.toml

@@ -5,11 +5,4 @@ nicks = ["playbot-rs", "playbot-rs-mini"]
 #password = "1234"
 server = "irc.mozilla.org"
 #port = 6667
-channels = ["#rust"]
-
-[[server]]
-nicks = ["playbot-rs"]
-#password = "1234"
-server = "irc.mozilla.org"
-#port = 6667
-channels = ["#rust-offtopic"]
+channels = ["#rust", "#rust-internals"]

playbot.toml

@@ -1,4 +1,7 @@
 extern crate rust_playpen;
+
+#[macro_use] extern crate log;
+extern crate env_logger;
 extern crate irc;
 extern crate toml;
 extern crate hyper;
@@ -34,7 +37,7 @@ fn get_rust_versions() -> Vec<String> {
         let version = str::from_utf8(&output).unwrap();
         // Strip the trailing newline
         let version = String::from(version.lines().next().unwrap());
-        println!("got {:?} Rust version: {}", channel, version);
+        debug!("got {:?} Rust version: {}", channel, version);
         versions.push(version);
     }
 
@@ -167,19 +170,19 @@ fn main() {{
             let command = &msg[self.conn.current_nickname().len()..]
                 .trim_left_matches(|ch| ch == ',' || ch == ':')
                 .trim();
-            println!("<{}> {}", from, command);
+            info!("<{}> {}", from, command);
             self.handle_cmd(chan, command);
         }
     }
 
     /// Called when receiving a private message from `from` (via `/msg playbot-rs ...`)
     fn handle_privmsg(&mut self, from: &str, msg: &str) {
-        println!("(/msg) <{}> {}", from, msg);
+        info!("(/msg) <{}> {}", from, msg);
         self.handle_cmd(from, msg);
     }
 
     fn main_loop(&mut self) {
-        println!("playbot at your service!");
+        info!("playbot at your service!");
         let cloned = self.conn.clone();
         for msg in cloned.iter() {
             let msg = match msg {
@@ -217,6 +220,8 @@ fn log_error<E: Error>(e: E) {
 }
 
 fn main() {
+    env_logger::init().unwrap();
+
     fs::metadata("whitelist").expect("syscall whitelist file not found");
 
     let bitly_key = read_bitly_token();

src/bin/playbot.rs

@@ -1,6 +1,8 @@
 extern crate rust_playpen;
 
 #[macro_use] extern crate iron;
+#[macro_use] extern crate log;
+extern crate env_logger;
 extern crate hyper;
 extern crate staticfile;
 extern crate router;
@@ -226,6 +228,8 @@ impl AfterMiddleware for EnablePostCors {
 }
 
 fn main() {
+    env_logger::init().unwrap();
+
     // Make sure pygmentize is installed before starting the server
     Command::new("pygmentize").spawn().unwrap().kill().unwrap();
 
@@ -241,6 +245,6 @@ fn main() {
     chain.link_after(EnablePostCors);
 
     let addr = ("0.0.0.0", 80);
-    println!("listening on {:?}", addr);
+    info!("listening on {:?}", addr);
     Iron::new(chain).http(addr).unwrap();
 }

src/bin/playpen.rs

@@ -1,5 +1,6 @@
 #![feature(process_exec)]
 
+#[macro_use] extern crate log;
 extern crate libc;
 extern crate lru_cache;
 
@@ -115,12 +116,12 @@ pub fn exec(channel: ReleaseChannel,
             Ok(())
         });
 
-        println!("running ({:?}): {} {:?}", channel, cmd, key.args);
+        info!("running ({:?}): {} {:?}", channel, cmd, key.args);
         let mut child = try!(command.spawn());
         try!(child.stdin.as_mut().unwrap().write_all(key.input.as_bytes()));
 
         let out = try!(child.wait_with_output());
-        println!("=> {}", out.status);
+        info!("=> {}", out.status);
         cache.insert(key, (out.status.clone(), out.stdout.clone()));
         Ok((out.status.clone(), out.stdout.clone()))
     })