broken
Harald Wolff 2019-08-30 12:40:28 +02:00
parent 8ff5178378
commit e8b7eda522
9 changed files with 25 additions and 11 deletions

View File

@ -191,6 +191,11 @@ namespace ln.skyscanner
return "SkyScanner 0.1a";
}
public void Shutdown()
{
ThreadPool.QueueUserWorkItem((state) => ((Application)this.skyscannerService.CurrentApplicationInterface).Stop());
}
}

View File

@ -26,7 +26,7 @@ namespace ln.skyscanner.import.skytron
ImportStammdaten(mapper);
ImportNodes(mapper);
ImportL2Segmente(mapper);
//ImportL2Segmente(mapper);
} catch (Exception e)
{

View File

@ -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" />

View File

@ -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>

View File

@ -100,6 +100,8 @@ namespace ln.skyscanner.services
}
}
checkPool.Abort();
coreService.RPCContainer.Remove("CheckService");
entityService = null;
performanceValueService = null;

View File

@ -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);

View File

@ -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));
}
}
}

View File

@ -143,7 +143,9 @@
$("#nodeTable").DataTable()
.clear()
.rows
.add(r);
.add(r)
.draw();
});
</script>

View File

@ -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>