Merge pull request #5 from jameson2011/dev

Dev
jameson2011 · Jun 11, 2020 · 4396b80 · 4396b80
2 parents 79311eb + 5fb4fe5
commit 4396b80
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/build.fsx b/build.fsx
@@ -66,25 +66,19 @@ let publishAndCopy runtime =
 
     Shell.copyDir targetDir sourceDir (fun _ -> true)
 
-Target.create "PublishRuntime-ubuntu-arm" (fun _ -> publishAndCopy "ubuntu-arm")
 Target.create "PublishRuntime-ubuntu-arm64" (fun _ -> publishAndCopy "ubuntu-arm64")
 Target.create "PublishRuntime-ubuntu-x64" (fun _ -> publishAndCopy "ubuntu-x64")
 Target.create "PublishRuntime-win-x86" (fun _ -> publishAndCopy "win-x86")
-Target.create "PublishRuntime-win-arm" (fun _ -> publishAndCopy "win-arm")
-Target.create "PublishRuntime-linux-arm" (fun _ -> publishAndCopy "linux-arm")
 Target.create "PublishRuntime-linux-arm64" (fun _ -> publishAndCopy "linux-arm64")
 
 
 Target.create "All" ignore
 
 "Clean"
   ==> "Build"
-  ==> "PublishRuntime-ubuntu-arm"
   ==> "PublishRuntime-ubuntu-arm64"
   ==> "PublishRuntime-ubuntu-x64"
   ==> "PublishRuntime-win-x86"
-  ==> "PublishRuntime-win-arm"
-  ==> "PublishRuntime-linux-arm"
   ==> "PublishRuntime-linux-arm64"
   ==> "All"
 

diff --git a/src/zKbProxy/KillProviderActor.fs b/src/zKbProxy/KillProviderActor.fs
@@ -39,7 +39,7 @@ type KillProviderActor(log: PostMessage, stats: PostMessage, config: Configurati
     let getKillCount()=
         async {                
             try
-                return! (dbCollection.CountAsync(fun _ -> true) |> Async.AwaitTask)
+                return! (dbCollection.CountDocumentsAsync(fun _ -> true) |> Async.AwaitTask)
             with
             | e ->  logException e
                     return 0L

diff --git a/src/zKbProxy/MongoDb.fs b/src/zKbProxy/MongoDb.fs
@@ -87,9 +87,9 @@
         let setIndex (path: string) (collection: IMongoCollection<'a>) =                        
             let json = sprintf "{'%s': 1 }" path
             let def = IndexKeysDefinition<'a>.op_Implicit(json)
+            let model = CreateIndexModel<'a>(def)
+            let r = collection.Indexes.CreateOne(model)
 
-            let r = collection.Indexes.CreateOne(def)
-
             collection
 
         let getCollection colName (db: IMongoDatabase) =
@@ -113,14 +113,14 @@
             initCollection "" server dbName collectionName userName password 
 
         let upsert (collection: IMongoCollection<BsonDocument>) (doc: BsonDocument) =
-            let opts = UpdateOptions()
+            let opts = ReplaceOptions()
             opts.IsUpsert <- true
-
             let filter = doc |> Bson.getId
                              |> idFilter |> Bson.ofJson 
                              |> FilterDefinition.op_Implicit
             collection.ReplaceOne(filter, doc, opts) |> ignore 
 
+
         let delete (collection: IMongoCollection<BsonDocument>) id =
 
             let filter = id |> idFilter |> Bson.ofJson