3 Commits
2 changed files with 14 additions and 7 deletions
+4 -3
View File
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("BlubbFish")]
[assembly: AssemblyProduct("Bot-Utils")]
[assembly: AssemblyCopyright("Copyright © 2018 - 27.05.2019")]
[assembly: AssemblyCopyright("Copyright © 2018 - 30.08.2019")]
[assembly: AssemblyTrademark("© BlubbFish")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("de-DE")]
@@ -33,8 +33,8 @@ using System.Runtime.InteropServices;
// Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
// indem Sie "*" wie unten gezeigt eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0")]
[assembly: AssemblyFileVersion("1.2.0")]
[assembly: AssemblyVersion("1.2.1")]
[assembly: AssemblyFileVersion("1.2.1")]
/*
* 1.1.0 Remove Helper from Bot-Utils
@@ -49,4 +49,5 @@ using System.Runtime.InteropServices;
* 1.1.8 Add logger to Webserver Class
* 1.1.9 Modify Output of SendFileResponse
* 1.2.0 Refactor Bot to ABot and refere MultiSourceBot, Webserver and Bot to it. Add MultiSourceBot. Rewrite Mqtt module so that it not need to watch the connection.
* 1.2.1 When using Dispose, kill also mqtt connection and other tiny fixes
*/
+9 -3
View File
@@ -28,7 +28,7 @@ namespace BlubbFish.Utils.IoT.Bots {
this.httplistener = new HttpListener();
this.httplistener.Prefixes.Add(this.config["prefix"]);
this.httplistener.Start();
ThreadPool.QueueUserWorkItem((o) => {
_ = ThreadPool.QueueUserWorkItem((o) => {
Console.WriteLine("Webserver is Running...");
try {
while(this.httplistener.IsListening) {
@@ -97,7 +97,7 @@ namespace BlubbFish.Utils.IoT.Bots {
return true;
}
} catch(Exception e) {
Helper.WriteError("500 - " + e.Message);
Helper.WriteError("500 - " + e.Message + "\n\n" + e.StackTrace);
cont.Response.StatusCode = 500;
return false;
}
@@ -117,7 +117,10 @@ namespace BlubbFish.Utils.IoT.Bots {
cont.Response.OutputStream.Write(buf, 0, buf.Length);
Console.WriteLine("200 - " + cont.Request.Url.PathAndQuery);
return true;
} catch { }
} catch(Exception e) {
Helper.WriteError("500 - " + e.Message + "\n\n" + e.StackTrace);
cont.Response.StatusCode = 500;
}
return false;
}
@@ -144,6 +147,9 @@ namespace BlubbFish.Utils.IoT.Bots {
public override void Dispose() {
this.httplistener.Stop();
this.httplistener.Close();
if(this.databackend != null) {
this.databackend.Dispose();
}
base.Dispose();
}