summaryrefslogtreecommitdiff
path: root/DSACore
diff options
context:
space:
mode:
Diffstat (limited to 'DSACore')
-rw-r--r--DSACore/FireBase/Database.cs1
-rw-r--r--DSACore/Hubs/ChatHub.cs2
-rw-r--r--DSACore/Program.cs2
-rw-r--r--DSACore/Startup.cs4
-rw-r--r--DSACore/appsettings.json4
5 files changed, 7 insertions, 6 deletions
diff --git a/DSACore/FireBase/Database.cs b/DSACore/FireBase/Database.cs
index 2c0f14d..db57381 100644
--- a/DSACore/FireBase/Database.cs
+++ b/DSACore/FireBase/Database.cs
@@ -29,7 +29,6 @@ namespace DSACore.FireBase
private static async Task Initialize()
{
-
IntializeCollection("Chars", Chars);
IntializeCollection("MeleeWeapons", MeleeList);
IntializeCollection("RangedWeapons", RangedWeapons);
diff --git a/DSACore/Hubs/ChatHub.cs b/DSACore/Hubs/ChatHub.cs
index 3e83a34..1994164 100644
--- a/DSACore/Hubs/ChatHub.cs
+++ b/DSACore/Hubs/ChatHub.cs
@@ -142,7 +142,7 @@ namespace DSACore.Hubs
{
var group = getGroup(Context.ConnectionId);
- Database.AddChar(new Character(new MemoryStream(Encoding.UTF8.GetBytes(xml))), group);
+ await Database.AddChar(new Character(new MemoryStream(Encoding.UTF8.GetBytes(xml))), group);
//throw new NotImplementedException("add database call to add groups");
}
diff --git a/DSACore/Program.cs b/DSACore/Program.cs
index cd85710..d8cb67c 100644
--- a/DSACore/Program.cs
+++ b/DSACore/Program.cs
@@ -15,7 +15,7 @@ namespace DSACore
{
public static void Main(string[] args)
{
- Database.GetGroup(0);
+ Database.GetGroup(0).Wait();
DSA_Game.Dsa.Startup();
CreateWebHostBuilder(args).Build().Run();
}
diff --git a/DSACore/Startup.cs b/DSACore/Startup.cs
index e024cb4..210a056 100644
--- a/DSACore/Startup.cs
+++ b/DSACore/Startup.cs
@@ -55,7 +55,7 @@ namespace DSACore
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
{
- if (env.IsDevelopment()||true)
+ if (env.IsDevelopment())
{
app.UseDeveloperExceptionPage();
}
@@ -70,7 +70,7 @@ namespace DSACore
//app.UseCors("AllowSpecificOrigin");
- //app.UseHttpsRedirection();
+ app.UseHttpsRedirection();
app.UseMvc();
}
}
diff --git a/DSACore/appsettings.json b/DSACore/appsettings.json
index def9159..dee968c 100644
--- a/DSACore/appsettings.json
+++ b/DSACore/appsettings.json
@@ -1,7 +1,9 @@
{
"Logging": {
"LogLevel": {
- "Default": "Warning"
+ "Microsoft.AspNetCore.SignalR": "Debug",
+ "Microsoft.AspNetCore.Http.Connections": "Debug",
+ "Default": "Debug"
}
},
"AllowedHosts": "*"