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 @@
-
@@ -44,17 +43,18 @@
- packages\BouncyCastle.1.8.3.1\lib\BouncyCastle.Crypto.dll
+ ..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll
- packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll
+ ..\packages\Google.Protobuf.3.9.1\lib\net45\Google.Protobuf.dll
- packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll
+ ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll
- packages\MySql.Data.8.0.17\lib\net452\MySql.Data.dll
+ ..\packages\MySql.Data.8.0.17\lib\net452\MySql.Data.dll
+
diff --git a/packages.config b/packages.config
index df9ce97..1f19f06 100644
--- a/packages.config
+++ b/packages.config
@@ -1,7 +1,7 @@
-
-
+
+
\ 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("ID");
+ SessionMapper.EnsureIndex("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));
+
+ $("").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();
+
});
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 @@
System |
|
|
- |
+ |
Crawler |