From e8b7eda522c1e4b30a29c4244fb401bffb65dd57 Mon Sep 17 00:00:00 2001
From: Harald Wolff <haraldwolff@skyoffice>
Date: Fri, 30 Aug 2019 12:40:28 +0200
Subject: [PATCH] WIP

---
 SkyScanner.cs                       |  5 +++++
 import/skytron/SkytronImport.cs     |  2 +-
 ln.skyscanner.csproj                | 10 +++++-----
 packages.config                     |  4 ++--
 services/CheckService.cs            |  2 ++
 services/EntityService.cs           |  2 ++
 templates/static/ln.application.js  |  5 ++++-
 templates/static/network/nodes.html |  4 +++-
 templates/static/system/index.html  |  2 +-
 9 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/SkyScanner.cs b/SkyScanner.cs
index 01252c2..d1f488a 100644
--- a/SkyScanner.cs
+++ b/SkyScanner.cs
@@ -191,6 +191,11 @@ namespace ln.skyscanner
                     return "SkyScanner 0.1a";
                 }
 
+                public void Shutdown()
+                {
+                    ThreadPool.QueueUserWorkItem((state) => ((Application)this.skyscannerService.CurrentApplicationInterface).Stop());
+                }
+
 
 
             }
diff --git a/import/skytron/SkytronImport.cs b/import/skytron/SkytronImport.cs
index 3913eb2..fa77b4d 100644
--- a/import/skytron/SkytronImport.cs
+++ b/import/skytron/SkytronImport.cs
@@ -26,7 +26,7 @@ namespace ln.skyscanner.import.skytron
 
                 ImportStammdaten(mapper);
                 ImportNodes(mapper);
-                ImportL2Segmente(mapper);
+                //ImportL2Segmente(mapper);
 
             } catch (Exception e)
             {
diff --git a/ln.skyscanner.csproj b/ln.skyscanner.csproj
index 9b391cb..a842745 100644
--- a/ln.skyscanner.csproj
+++ b/ln.skyscanner.csproj
@@ -33,7 +33,6 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Net.Http" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.ComponentModel" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration.Install" />
     <Reference Include="System.Data" />
@@ -44,17 +43,18 @@
     <Reference Include="System.Xml" />
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="BouncyCastle.Crypto">
-      <HintPath>packages\BouncyCastle.1.8.3.1\lib\BouncyCastle.Crypto.dll</HintPath>
+      <HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
     </Reference>
     <Reference Include="Google.Protobuf">
-      <HintPath>packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
+      <HintPath>..\packages\Google.Protobuf.3.9.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
     <Reference Include="Renci.SshNet">
-      <HintPath>packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
+      <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data">
-      <HintPath>packages\MySql.Data.8.0.17\lib\net452\MySql.Data.dll</HintPath>
+      <HintPath>..\packages\MySql.Data.8.0.17\lib\net452\MySql.Data.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
diff --git a/packages.config b/packages.config
index df9ce97..1f19f06 100644
--- a/packages.config
+++ b/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.3.1" targetFramework="net47" />
-  <package id="Google.Protobuf" version="3.6.1" targetFramework="net47" />
+  <package id="BouncyCastle" version="1.8.5" targetFramework="net47" />
+  <package id="Google.Protobuf" version="3.9.1" targetFramework="net47" />
   <package id="MySql.Data" version="8.0.17" targetFramework="net47" />
   <package id="SSH.NET" version="2016.1.0" targetFramework="net47" />
 </packages>
\ No newline at end of file
diff --git a/services/CheckService.cs b/services/CheckService.cs
index 332e508..309236d 100644
--- a/services/CheckService.cs
+++ b/services/CheckService.cs
@@ -100,6 +100,8 @@ namespace ln.skyscanner.services
                 }
             }
 
+            checkPool.Abort();
+
             coreService.RPCContainer.Remove("CheckService");
             entityService = null;
             performanceValueService = null;
diff --git a/services/EntityService.cs b/services/EntityService.cs
index 79ac99f..2b43274 100644
--- a/services/EntityService.cs
+++ b/services/EntityService.cs
@@ -51,6 +51,8 @@ namespace ln.skyscanner.services
             StorageContainer.Open();
             StorageSession.Open();
 
+            SessionMapper.EnsureIndex<Node>("ID");
+            SessionMapper.EnsureIndex<Node>("uniqueIdentity");
 
             CoreService.RPCContainer.Add("entities",RPCInstance);
 
diff --git a/templates/static/ln.application.js b/templates/static/ln.application.js
index c64ef7f..4f4ce61 100644
--- a/templates/static/ln.application.js
+++ b/templates/static/ln.application.js
@@ -46,7 +46,10 @@
                         }
                     }
                 } catch(exc){
-                    console.log("websocket malformed message" + JSON.stringify(e));
+                    console.log(exc);
+                    console.log("websocket malformed message: " + (e.data));
+
+                    $("<textarea></textarea>").text(e.data).appendTo($(body));
                 }
             }
         }
diff --git a/templates/static/network/nodes.html b/templates/static/network/nodes.html
index 4eb9e96..b1dacb9 100644
--- a/templates/static/network/nodes.html
+++ b/templates/static/network/nodes.html
@@ -143,7 +143,9 @@
         $("#nodeTable").DataTable()
             .clear()
             .rows
-                .add(r);
+            .add(r)
+            .draw();
+
     });
     
 </script>
diff --git a/templates/static/system/index.html b/templates/static/system/index.html
index 307b577..dc7d08f 100644
--- a/templates/static/system/index.html
+++ b/templates/static/system/index.html
@@ -9,7 +9,7 @@
             <td>System</td>
             <td></td>
             <td style="width: 100px;"></td>
-            <td style="width: 100px;"><button onclick="skyapi().call('api/management','Shutdown')">Shutdown</button></td>
+            <td style="width: 100px;"><button onclick="LN().rpc('','Shutdown',[],function(r,e){});">Shutdown</button></td>
         </tr>
         <tr>
             <td>Crawler</td>