WIP
parent
8ff5178378
commit
e8b7eda522
|
@ -191,6 +191,11 @@ namespace ln.skyscanner
|
||||||
return "SkyScanner 0.1a";
|
return "SkyScanner 0.1a";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Shutdown()
|
||||||
|
{
|
||||||
|
ThreadPool.QueueUserWorkItem((state) => ((Application)this.skyscannerService.CurrentApplicationInterface).Stop());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ namespace ln.skyscanner.import.skytron
|
||||||
|
|
||||||
ImportStammdaten(mapper);
|
ImportStammdaten(mapper);
|
||||||
ImportNodes(mapper);
|
ImportNodes(mapper);
|
||||||
ImportL2Segmente(mapper);
|
//ImportL2Segmente(mapper);
|
||||||
|
|
||||||
} catch (Exception e)
|
} catch (Exception e)
|
||||||
{
|
{
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
<Reference Include="System.Configuration" />
|
<Reference Include="System.Configuration" />
|
||||||
<Reference Include="System.Net.Http" />
|
<Reference Include="System.Net.Http" />
|
||||||
<Reference Include="Microsoft.CSharp" />
|
<Reference Include="Microsoft.CSharp" />
|
||||||
<Reference Include="System.ComponentModel" />
|
|
||||||
<Reference Include="System.ComponentModel.DataAnnotations" />
|
<Reference Include="System.ComponentModel.DataAnnotations" />
|
||||||
<Reference Include="System.Configuration.Install" />
|
<Reference Include="System.Configuration.Install" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
|
@ -44,17 +43,18 @@
|
||||||
<Reference Include="System.Xml" />
|
<Reference Include="System.Xml" />
|
||||||
<Reference Include="System.Net.Http.WebRequest" />
|
<Reference Include="System.Net.Http.WebRequest" />
|
||||||
<Reference Include="BouncyCastle.Crypto">
|
<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>
|
||||||
<Reference Include="Google.Protobuf">
|
<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>
|
||||||
<Reference Include="Renci.SshNet">
|
<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>
|
||||||
<Reference Include="MySql.Data">
|
<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>
|
||||||
|
<Reference Include="System.ComponentModel" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Program.cs" />
|
<Compile Include="Program.cs" />
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<packages>
|
<packages>
|
||||||
<package id="BouncyCastle" version="1.8.3.1" targetFramework="net47" />
|
<package id="BouncyCastle" version="1.8.5" targetFramework="net47" />
|
||||||
<package id="Google.Protobuf" version="3.6.1" targetFramework="net47" />
|
<package id="Google.Protobuf" version="3.9.1" targetFramework="net47" />
|
||||||
<package id="MySql.Data" version="8.0.17" targetFramework="net47" />
|
<package id="MySql.Data" version="8.0.17" targetFramework="net47" />
|
||||||
<package id="SSH.NET" version="2016.1.0" targetFramework="net47" />
|
<package id="SSH.NET" version="2016.1.0" targetFramework="net47" />
|
||||||
</packages>
|
</packages>
|
|
@ -100,6 +100,8 @@ namespace ln.skyscanner.services
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
checkPool.Abort();
|
||||||
|
|
||||||
coreService.RPCContainer.Remove("CheckService");
|
coreService.RPCContainer.Remove("CheckService");
|
||||||
entityService = null;
|
entityService = null;
|
||||||
performanceValueService = null;
|
performanceValueService = null;
|
||||||
|
|
|
@ -51,6 +51,8 @@ namespace ln.skyscanner.services
|
||||||
StorageContainer.Open();
|
StorageContainer.Open();
|
||||||
StorageSession.Open();
|
StorageSession.Open();
|
||||||
|
|
||||||
|
SessionMapper.EnsureIndex<Node>("ID");
|
||||||
|
SessionMapper.EnsureIndex<Node>("uniqueIdentity");
|
||||||
|
|
||||||
CoreService.RPCContainer.Add("entities",RPCInstance);
|
CoreService.RPCContainer.Add("entities",RPCInstance);
|
||||||
|
|
||||||
|
|
|
@ -46,7 +46,10 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch(exc){
|
} 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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,7 +143,9 @@
|
||||||
$("#nodeTable").DataTable()
|
$("#nodeTable").DataTable()
|
||||||
.clear()
|
.clear()
|
||||||
.rows
|
.rows
|
||||||
.add(r);
|
.add(r)
|
||||||
|
.draw();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<td>System</td>
|
<td>System</td>
|
||||||
<td></td>
|
<td></td>
|
||||||
<td style="width: 100px;"></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>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Crawler</td>
|
<td>Crawler</td>
|
||||||
|
|
Loading…
Reference in New Issue