Changeset 332 for binary-improvements/MapRendering/Web/Handlers

Timestamp:

Nov 16, 2018, 10:38:46 PM (6 years ago)

Author:

alloc

Message:

*Latest optimizations

Location:

binary-improvements/MapRendering/Web/Handlers

Files:

• ApiHandler.cs (modified) (3 diffs)
• StaticHandler.cs (modified) (3 diffs)
• UserStatusHandler.cs (modified) (1 diff)

binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs

@@ -4 +4 @@
 using System.Reflection;
 using AllocsFixes.NetConnections.Servers.Web.API;
+using UnityEngine.Profiling;
 
 namespace AllocsFixes.NetConnections.Servers.Web.Handlers {
@@ -40 +41 @@
                 }
 
+#if ENABLE_PROFILER
+                private static readonly CustomSampler apiHandlerSampler = CustomSampler.Create ("API_Handler");
+#endif
+
                 public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user,
                         int permissionLevel) {
@@ -55 +60 @@
                         if (apis.TryGetValue (apiName, out api)) {
                                 try {
+#if ENABLE_PROFILER
+                                        apiHandlerSampler.Begin ();
+#endif
                                         api.HandleRequest (req, resp, user, permissionLevel);
+#if ENABLE_PROFILER
+                                        apiHandlerSampler.End ();
+#endif
                                         return;
                                 } catch (Exception e) {

binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs

@@ -13 +13 @@
                         string moduleName = null) : base (moduleName) {
                         this.staticPart = staticPart;
-                        datapath = filePath;
+                        datapath = filePath + (filePath [filePath.Length - 1] == '/' ? "" : "/");
                         this.cache = cache;
                         this.logMissingFiles = logMissingFiles;
@@ -22 +22 @@
                         string fn = req.Url.AbsolutePath.Remove (0, staticPart.Length);
 
-                        byte[] content = cache.GetFileContent (datapath + "/" + fn);
+                        byte[] content = cache.GetFileContent (datapath + fn);
 
                         if (content != null) {
@@ -31 +31 @@
                                 resp.StatusCode = (int) HttpStatusCode.NotFound;
                                 if (logMissingFiles) {
-                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + "/" +
-                                                 req.Url.AbsolutePath.Remove (0, staticPart.Length) + "\"");
+                                        Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + fn + "\"");
                                 }
                         }

binary-improvements/MapRendering/Web/Handlers/UserStatusHandler.cs

@@ -19 +19 @@
                                 JSONObject permObj = new JSONObject ();
                                 permObj.Add ("module", new JSONString (perm.module));
-                                permObj.Add ("allowed",
-                                        new JSONBoolean (WebPermissions.Instance.ModuleAllowedWithLevel (perm.module, permissionLevel)));
+                                permObj.Add ("allowed", new JSONBoolean (perm.permissionLevel >= permissionLevel));
                                 perms.Add (permObj);
                         }