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

Timestamp:

Sep 22, 2014, 11:15:14 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

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

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

@@ -11 +11 @@
                 private string datapath;
                 private string staticPart;
-                private bool cache;
+                private AllocsFixes.FileCache.AbstractCache cache;
                 private bool logMissingFiles;
-                private Dictionary<string, byte[]> fileCache = new Dictionary<string, byte[]> ();
 
-                public StaticHandler (string staticPart, string filePath, bool cache, bool logMissingFiles)
+                public StaticHandler (string staticPart, string filePath, AllocsFixes.FileCache.AbstractCache cache, bool logMissingFiles)
                 {
                         this.staticPart = staticPart;
@@ -28 +27 @@
                                 string fn = req.Url.AbsolutePath.Remove (0, staticPart.Length);
 
-                                byte[] content;
-                                if (cache) {
-                                        lock (fileCache) {
-                                                if (!fileCache.ContainsKey (fn)) {
-                                                        if (!File.Exists (datapath + "/" + fn)) {
-                                                                throw new FileNotFoundException ();
-                                                        }
-
-                                                        fileCache.Add (fn, File.ReadAllBytes (datapath + "/" + fn));
-                                                }
-
-                                                content = fileCache [fn];
-                                        }
+                                byte[] content = cache.GetFileContent (datapath + "/" + fn);
+                                if (content != null) {
+                                        resp.ContentType = MimeType.GetMimeType (Path.GetExtension (fn));
+                                        resp.ContentLength64 = content.Length;
+                                        resp.OutputStream.Write (content, 0, content.Length);
                                 } else {
-                                        if (!File.Exists (datapath + "/" + fn)) {
-                                                throw new FileNotFoundException ();
-                                        }
-
-                                        content = File.ReadAllBytes (datapath + "/" + fn);
+                                        resp.StatusCode = (int)HttpStatusCode.NotFound;
+                                        if (logMissingFiles)
+                                                Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + req.Url.AbsolutePath.Remove (0, staticPart.Length) + "\"");
+                                        return;
                                 }
-
-                                resp.ContentType = MimeType.GetMimeType (Path.GetExtension (fn));
-                                resp.ContentLength64 = content.Length;
-                                resp.OutputStream.Write (content, 0, content.Length);
-                        } catch (FileNotFoundException) {
-                                resp.StatusCode = (int)HttpStatusCode.NotFound;
-                                if (logMissingFiles)
-                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" + req.Url.AbsolutePath.Remove (0, staticPart.Length) + "\"");
-                                return;
                         } catch (Exception e) {
                                 Log.Out ("Error in StaticHandler.HandleRequest: " + e);