From c31de207c706dec12b30d1a9be3edd7300d7a81e Mon Sep 17 00:00:00 2001
From: Dennis Schwerdel <schwerdel@googlemail.com>
Date: Sat, 7 Nov 2020 12:04:25 +0100
Subject: [PATCH] Some small fixes

---
 contrib/testnet.py | 2 +-
 src/cloud.rs       | 2 +-
 src/error.rs       | 6 +++---
 src/main.rs        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contrib/testnet.py b/contrib/testnet.py
index db31691..77a2802 100755
--- a/contrib/testnet.py
+++ b/contrib/testnet.py
@@ -5,7 +5,7 @@ import atexit, argparse, os
 
 REGION = "eu-central-1"
 
-VERSION = "1.4.0"
+VERSION = "2.0.0"
 
 
 parser = argparse.ArgumentParser(description='Create a test setup')
diff --git a/src/cloud.rs b/src/cloud.rs
index 99198f0..73ed2f7 100644
--- a/src/cloud.rs
+++ b/src/cloud.rs
@@ -828,7 +828,7 @@ impl<D: Device, P: Protocol, S: Socket, TS: TimeSource> GenericCloud<D, P, S, TS
                     if poll_error {
                         fail!("Poll wait failed again: {}", err);
                     }
-                    error!("Poll wait failed: {}, retrying...", err);
+                    debug!("Poll wait failed: {}, retrying...", err);
                     poll_error = true;
                 }
                 WaitResult::Timeout => {}
diff --git a/src/error.rs b/src/error.rs
index 642d978..e735ed5 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -26,13 +26,13 @@ pub enum Error {
     #[error("Socker error: {0}")]
     Socket(&'static str),
 
-    #[error("Socker error: {0}")]
+    #[error("Socker error: {0} ({1})")]
     SocketIo(&'static str, #[source] io::Error),
 
     #[error("Device error: {0}")]
     Device(&'static str),
 
-    #[error("Device error: {0}")]
+    #[error("Device error: {0} ({1})")]
     DeviceIo(&'static str, #[source] io::Error),
 
     #[error("File error: {0}")]
@@ -41,7 +41,7 @@ pub enum Error {
     #[error("Message error: {0}")]
     Message(&'static str),
 
-    #[error("Beacon error: {0}")]
+    #[error("Beacon error: {0} ({1})")]
     BeaconIo(&'static str, #[source] io::Error),
 
     #[error("Parse error: {0}")]
diff --git a/src/main.rs b/src/main.rs
index 2269948..868c8d1 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -88,7 +88,7 @@ impl log::Log for DualLogger {
             println!("{} - {}", record.level(), record.args());
             if let Some(ref file) = self.file {
                 let mut file = file.lock().expect("Lock poisoned");
-                let time = time::OffsetDateTime::now_local().format("%F %T");
+                let time = time::OffsetDateTime::now_local().format("%F %H:%M:%S");
                 writeln!(file, "{} - {} - {}", time, record.level(), record.args())
                     .expect("Failed to write to logfile");
             }