diff --git a/ClassLibrary1/Class1.cs b/ClassLibrary1/Class1.cs
deleted file mode 100644
index 174f12f..0000000
--- a/ClassLibrary1/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace ClassLibrary1
-{
- public class Class1
- {
- }
-}
diff --git a/ClassLibrary1/ClassLibrary1.csproj b/ClassLibrary1/ClassLibrary1.csproj
deleted file mode 100644
index 954020d..0000000
--- a/ClassLibrary1/ClassLibrary1.csproj
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
- netstandard1.4
-
-
-
\ No newline at end of file
diff --git a/server/CircleScape.csproj b/server/CircleScape.csproj
index 49f97d4..4971af3 100644
--- a/server/CircleScape.csproj
+++ b/server/CircleScape.csproj
@@ -141,7 +141,8 @@
- XCOPY "$(ProjectDir)Assets" "$(TargetDir)" /Y /E
+ mkdir "$(TargetDir)Assets"
+XCOPY "$(ProjectDir)Assets" "$(TargetDir)Assets" /Y /E
COPY "$(ProjectDir)config.ini" "$(TargetDir)" /Y
diff --git a/server/Entrypoint.cs b/server/Entrypoint.cs
index 6cf5440..7207280 100644
--- a/server/Entrypoint.cs
+++ b/server/Entrypoint.cs
@@ -7,13 +7,33 @@ using System.Threading.Tasks;
using System.Numerics;
using Square;
using System.Net;
+using Kneesocks.WebSocket;
namespace CircleScape {
class Entrypoint {
static void Main(string[] args) {
- foreach()
- var server = new Kneesocks.Server(6770, PoolManager.Pending);
- server.Start();
+
+ Dictionary servers
+ = new Dictionary();
+ Dictionary> pools
+ = new Dictionary>();
+
+ foreach(var server in Configuration.Servers) {
+ var pool = new Pool {
+ InitialCount = 3,
+ InitialSize = 3,
+ SizeGrowth = 3,
+ MaxSize = 100
+ };
+
+ pools.Add(server["Id"], pool);
+ servers.Add(server["Id"], new Server((ushort)server["Port"], pool, server));
+ }
+
+
+
+ //var server = new Server(6770, PoolManager.Pending);
+ //server.Start();
/*while(true) {
var send = Console.ReadLine();
@@ -24,8 +44,7 @@ namespace CircleScape {
Console.ReadLine();
- server.Stop();
- PoolManager.Dispose();
+ //server.Stop();
}
}
}
diff --git a/server/Libraries/Kneesocks/Kneesocks.csproj b/server/Libraries/Kneesocks/Kneesocks.csproj
index 0a5bc5b..ff2140c 100644
--- a/server/Libraries/Kneesocks/Kneesocks.csproj
+++ b/server/Libraries/Kneesocks/Kneesocks.csproj
@@ -40,14 +40,14 @@
-
-
-
-
+
+
+
+
-
-
-
+
+
+
@@ -55,6 +55,9 @@
Square
+
+
+