Merge pull request #4 from jameson2011/dev

Dev

Author: jameson2011

src/zKbProxy/CommandLine.fs

@@ -20,11 +20,12 @@ module CommandLine=
     let bufferSizeArg = "buffer"
     let noCacheArg = "nocache"
     let sessionTimeoutArg = "sessiontimeout"
+    let configArg = "config"
 
     let private longestArg = 
         [ killSourceUriArg; dbServerArg; dbNameArg; dbKillsCollectionArg; dbSessionCollectionArg;
             dbUserArg; dbPasswordArg; webPortArg; bufferSizeArg; noCacheArg; 
-            sessionTimeoutArg; ]
+            sessionTimeoutArg; configArg; ]
         |> Seq.map String.length
         |> Seq.max
 
@@ -84,6 +85,9 @@ module CommandLine=
         app.Description <- "A proxy for zKb's RedisQ service"
         app
 
+    let addConfigFileArg =              addSingleOption configArg configArg "The configuration file"
+    let getConfigFileValue app =        getStringOption configArg app
+
     let addKillSourceUriArg =           addSingleOption killSourceUriArg "killsource" "The URI providing zKB kills. By default this is zKB RedisQ"
     let getKillSourceUriValue app =     getStringOption killSourceUriArg app
 
@@ -148,6 +152,7 @@ module CommandLine=
                                     >> addLiveBufferSizeArg
                                     >> addNoCacheArg
                                     >> addSessionTimeoutArg
+                                    >> addConfigFileArg
                                     >> setAction cmd
         app.Command("run", (composeAppPipe f)) |> ignore
         app

src/zKbProxy/Program.fs

@@ -9,7 +9,45 @@ open System.Threading
 
 module Program=
 
-    let private configFromStartApp(app: CommandLine.App)=        
+    open Newtonsoft.Json.Linq
+
+    let jsonToConfig(j: JObject) =
+        let toJValue (token: JToken) = token :?> JValue
+        
+        let toBool = Option.ofNull >> Option.map (toJValue >> (fun value -> value.ToObject<bool>()))
+        let toInt32 = Option.ofNull >> Option.map (toJValue >> (fun value -> value.ToObject<int32>()))
+        let toUint16 = Option.ofNull >> Option.map (toJValue >> (fun value -> value.ToObject<uint16>()))
+        let toString = Option.ofNull >> Option.map (toJValue >> (fun value -> value.ToObject<string>()))
+        let toTimeSpan = Option.ofNull >> Option.map (toJValue >> (fun value -> value.ToObject<TimeSpan>()))
+        let defaultConfig = Configuration.empty
+
+        { Configuration.KillSourceUri = j.["killSourceUri"] |> toString |> Option.defaultValue defaultConfig.KillSourceUri;
+            NoCache =                   j.["noCache"] |> toBool |> Option.defaultValue defaultConfig.NoCache;
+            MongoServer =               j.["mongoServer"] |> toString |> Option.defaultValue defaultConfig.MongoServer;
+            DbName =                    j.["dbName"] |> toString |> Option.defaultValue defaultConfig.DbName;
+            KillsDbCollection =         j.["killsDbCollection"] |> toString |> Option.defaultValue defaultConfig.KillsDbCollection;
+            SessionsDbCollection =      j.["sessionsDbCollection"] |> toString |> Option.defaultValue defaultConfig.SessionsDbCollection;
+            MongoUserName =             j.["mongoUserName"] |> toString |> Option.defaultValue defaultConfig.MongoUserName;
+            MongoPassword =             j.["mongoPassword"] |> toString |> Option.defaultValue defaultConfig.MongoPassword;
+            WebServerPort =             j.["webServerPort"] |> toUint16 |> Option.defaultValue defaultConfig.WebServerPort;
+            BufferSize =                j.["bufferSize"] |> toInt32 |> Option.defaultValue defaultConfig.BufferSize;
+            SessionTimeout =            j.["sessionTimeout"] |> toTimeSpan |> Option.defaultValue defaultConfig.SessionTimeout;
+        }
+
+
+
+    let private configFromFile(filePath: string) =
+        
+        if not <| System.IO.File.Exists(filePath) then
+            let msg = filePath |> sprintf "The configuration file %s was not found."
+            raise (System.IO.FileNotFoundException(msg))
+        
+        filePath 
+            |> System.IO.File.ReadAllText 
+            |> JObject.Parse
+            |> jsonToConfig
+
+    let private configFromCmdLine(app: CommandLine.App)=        
         {   Configuration.empty with
                  KillSourceUri = CommandLine.getKillSourceUriValue app 
                                         |> Option.defaultValue ConfigurationDefaults.KillSourceUri
@@ -32,6 +70,12 @@ module Program=
                  NoCache = CommandLine.getNoCacheValue app;
                  SessionTimeout = CommandLine.getSessionTimeoutArg app;
         }   
+
+    let private configFromStartApp(app: CommandLine.App)=        
+        app 
+            |> CommandLine.getConfigFileValue
+            |> Option.map configFromFile 
+            |> Option.defaultWith (fun () -> configFromCmdLine app)
 
     let private validateConfig (config: Configuration) = 
         let validateString value name  =            

src/zKbProxy/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "zKbProxy": {
       "commandName": "Project",
-      "commandLineArgs": "run --server localhost -db zKbRedisqProxy -killscol zkbKills --buffer 200000"
+      "commandLineArgs": "run --config ..\\..\\..\\..\\..\\..\\..\\..\\Projects\\Docs\\zkbproxy\\zkbproxy.json"
     }
   }
 }