diff --git a/BosMon-Webserver/XMLWebserver.cs b/BosMon-Webserver/XMLWebserver.cs index 1cff65c..a86318c 100644 --- a/BosMon-Webserver/XMLWebserver.cs +++ b/BosMon-Webserver/XMLWebserver.cs @@ -5,6 +5,7 @@ using System.Net; using System.Text; using System.Threading; using System.Web; +using BlubbFish.Utils; namespace BlubbFish.BosMon.Webserver { internal class XMLWebserver { @@ -25,26 +26,25 @@ namespace BlubbFish.BosMon.Webserver { try { while (this._listener.IsListening) { ThreadPool.QueueUserWorkItem((c) => { - HttpListenerContext ctx = c as HttpListenerContext; - if (ctx.Request.RawUrl == "/telegramin/" + this.config["upload_path"] + "/input.xml") { - try { + try { + HttpListenerContext ctx = c as HttpListenerContext; + if (ctx.Request.RawUrl == "/telegramin/" + this.config["upload_path"] + "/input.xml") { this.ParseInput(ctx); - } catch { } finally { ctx.Response.OutputStream.Close(); } - } else if(ctx.Request.RawUrl == "/telegramio/" + this.config["download_path"] + "/index.xml?loop=true") { - try { + } else if (ctx.Request.RawUrl == "/telegramio/" + this.config["download_path"] + "/index.xml?loop=true") { this.SendResponse(ctx); - } catch { } finally { - Console.WriteLine("Output Connection Closed!"); - ctx.Response.OutputStream.Close(); + } else { + ctx.Response.StatusCode = 404; } - } else { - ctx.Response.StatusCode = 404; ctx.Response.OutputStream.Close(); ctx.Response.Close(); + } catch(Exception e) { + Helper.WriteError("Context Exception: " + e.Message +""+e.Source+ "\n\n" + e.StackTrace); } }, this._listener.GetContext()); } - } catch { }; + } catch(Exception e) { + Helper.WriteError("Webserver Exception: " + e.Message); + }; }); } @@ -106,6 +106,7 @@ namespace BlubbFish.BosMon.Webserver { } } request.Response.StatusCode = 200; + return; } request.Response.StatusCode = 403; } diff --git a/BosMon-Webserver/bin/Release/BosMon-Webserver.exe b/BosMon-Webserver/bin/Release/BosMon-Webserver.exe index b1c29fb..0f5b14b 100644 Binary files a/BosMon-Webserver/bin/Release/BosMon-Webserver.exe and b/BosMon-Webserver/bin/Release/BosMon-Webserver.exe differ diff --git a/BosMon-Webserver/bin/Release/Utils.dll b/BosMon-Webserver/bin/Release/Utils.dll index 5825e56..a28cada 100644 Binary files a/BosMon-Webserver/bin/Release/Utils.dll and b/BosMon-Webserver/bin/Release/Utils.dll differ diff --git a/BosMon-Webserver/dpkg/control b/BosMon-Webserver/dpkg/control index 85e41df..892523e 100644 --- a/BosMon-Webserver/dpkg/control +++ b/BosMon-Webserver/dpkg/control @@ -3,7 +3,7 @@ Version: x.x-x Section: base Priority: optional Architecture: any -Depends: mono-runtime (>= 5.16.0) +Depends: mono-runtime (>= 5.16.0), libmono-system-web4.0-cil (>= 5.16.0) Maintainer: BlubbFish Description: Bosmon-Webserver A Webserver for Bosmon Telegrafs