Merge pull request #20 from CephalonRho/warp

Reimplement server.rs with warp

Cargo.toml

@@ -43,6 +43,8 @@ chashmap = "*"
 plugin = "*"
 tree_magic = "*"
 byte-unit = "*"
+snafu = "*"
+bytes = "*"
 #hyper = "*"
 #hyper-openssl = "*"
 

src/configuration.rs

@@ -1,4 +1,4 @@
-use std::net::Ipv4Addr;
+use std::net::{Ipv4Addr, IpAddr};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Configuration {
@@ -7,14 +7,15 @@ pub struct Configuration {
     pub persistence: Persistence,
     pub encryption: Encryption,
     pub webui: WebUI,
-    pub store: Store
+    pub store: Store,
+    pub http: Http
 }
 
 impl Configuration {
     pub fn default() -> Configuration {
         Configuration {
             default: Base {
-                bind_address: Ipv4Addr::LOCALHOST.to_string(),
+                bind_address: IpAddr::from(Ipv4Addr::LOCALHOST),
                 port: 7021, // TODO: change after implementing SSL
                 port_ssl: 7021,
                 use_ssl: false,
@@ -38,6 +39,9 @@ impl Configuration {
             store: Store {
                 max_limit: 7340032
             },
+            http: Http {
+                request_size_limit: 8388608
+            },
         }
     }
 
@@ -48,9 +52,9 @@ impl Configuration {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Base {
-    pub bind_address: String,
-    pub port: i32,
-    pub port_ssl: i32,
+    pub bind_address: IpAddr,
+    pub port: u16,
+    pub port_ssl: u16,
     pub use_ssl: bool,
 }
 
@@ -80,7 +84,12 @@ pub struct WebUI {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Store {
-    pub max_limit: i32
+    pub max_limit: u64
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct Http {
+    pub request_size_limit: u64
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]