Changeset 134 for binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs

Timestamp:

Aug 27, 2014, 5:35:51 PM (10 years ago)

Author:

alloc

Message:

Fixes

File:

• binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs (modified) (3 diffs)

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/StaticHandler.cs

@@ -3 +3 @@
 using System.IO;
 using System.Net;
+using System.Threading;
 
 namespace AllocsFixes.NetConnections.Servers.Web
@@ -11 +12 @@
                 private string staticPart;
                 private bool cache;
+                private bool logMissingFiles;
                 private Dictionary<string, byte[]> fileCache = new Dictionary<string, byte[]> ();
 
-                public StaticHandler (string staticPart, string filePath, bool cache)
+                public StaticHandler (string staticPart, string filePath, bool cache, bool logMissingFiles)
                 {
                         this.staticPart = staticPart;
                         this.datapath = filePath;
                         this.cache = cache;
+                        this.logMissingFiles = logMissingFiles;
                 }
 
-                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp)
+                public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, HttpListenerBasicIdentity user)
                 {
                         try {
@@ -27 +30 @@
                                 byte[] content;
                                 if (cache) {
-                                        if (!fileCache.ContainsKey (fn)) {
-                                                if (!File.Exists (datapath + "/" + fn)) {
-                                                        resp.StatusCode = (int)HttpStatusCode.NotFound;
-                                                        return;
+                                        Monitor.Enter (fileCache);
+                                        try {
+                                                if (!fileCache.ContainsKey (fn)) {
+                                                        if (!File.Exists (datapath + "/" + fn)) {
+                                                                resp.StatusCode = (int)HttpStatusCode.NotFound;
+                                                                if (logMissingFiles)
+                                                                        Log.Out ("Web:Static:FileNotFound: " + req.Url.AbsolutePath);
+                                                                return;
+                                                        }
+
+                                                        fileCache.Add (fn, File.ReadAllBytes (datapath + "/" + fn));
                                                 }
 
-                                                fileCache.Add (fn, File.ReadAllBytes (datapath + "/" + fn));
+                                                content = fileCache [fn];
+                                        } finally {
+                                                Monitor.Exit (fileCache);
                                         }
-
-                                        content = fileCache [fn];
                                 } else {
                                         if (!File.Exists (datapath + "/" + fn)) {
                                                 resp.StatusCode = (int)HttpStatusCode.NotFound;
+                                                if (logMissingFiles)
+                                                        Log.Out ("Web:Static:FileNotFound: " + req.Url.AbsolutePath);
                                                 return;
                                         }