diff options
| -rw-r--r-- | Software/DB/PPC/Tango.mdf | bin | 75497472 -> 75497472 bytes | |||
| -rw-r--r-- | Software/DB/PPC/Tango_log.ldf | bin | 53673984 -> 53673984 bytes | |||
| -rw-r--r-- | Software/Visual_Studio/Tango.UnitTesting/MachineService/PPC_Controller_TST.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Tango.Web/TangoWebApplication.cs | 1 | ||||
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs | 1 | ||||
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Web.config | 10 |
7 files changed, 13 insertions, 3 deletions
diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf Binary files differindex bac8a7680..d6f6f7df9 100644 --- a/Software/DB/PPC/Tango.mdf +++ b/Software/DB/PPC/Tango.mdf diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf Binary files differindex fc15dcc93..0d66b5a3b 100644 --- a/Software/DB/PPC/Tango_log.ldf +++ b/Software/DB/PPC/Tango_log.ldf diff --git a/Software/Visual_Studio/Tango.UnitTesting/MachineService/PPC_Controller_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/MachineService/PPC_Controller_TST.cs index 7c3d497b8..68232e512 100644 --- a/Software/Visual_Studio/Tango.UnitTesting/MachineService/PPC_Controller_TST.cs +++ b/Software/Visual_Studio/Tango.UnitTesting/MachineService/PPC_Controller_TST.cs @@ -13,7 +13,7 @@ namespace Tango.UnitTesting.MachineService [TestCategory("Machine Service - PPC")] public class PPC_Controller_TST { - private const string address = "http://localhost:51581"; + private const string address = "https://machineservice-test.twine-srv.com"; [TestMethod] public void Login_and_setup() diff --git a/Software/Visual_Studio/Tango.Web/TangoWebApplication.cs b/Software/Visual_Studio/Tango.Web/TangoWebApplication.cs index c9fea1678..f168fe9a4 100644 --- a/Software/Visual_Studio/Tango.Web/TangoWebApplication.cs +++ b/Software/Visual_Studio/Tango.Web/TangoWebApplication.cs @@ -26,7 +26,6 @@ namespace Tango.Web protected virtual void Application_Start() { LogManager.Default.RegisterLogger(new AzureCloudLogger()); - GlobalConfiguration.Configuration.Filters.Add(new LogExceptionFilterAttribute()); } diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs index a2016d4e0..a2c761824 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs @@ -65,7 +65,6 @@ namespace Tango.MachineService.Controllers using (ObservablesContext db = ObservablesContextHelper.CreateContext()) { - db.Configuration.LazyLoadingEnabled = false; String machine_guid = RequestToken.Object.MachineGuid; var machine = db.Machines.SingleOrDefault(x => x.Guid == machine_guid); diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs b/Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs index 56561e4ce..07d1514eb 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Global.asax.cs @@ -21,6 +21,8 @@ namespace Tango.MachineService FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); RouteConfig.RegisterRoutes(RouteTable.Routes); BundleConfig.RegisterBundles(BundleTable.Bundles); + + GlobalConfiguration.Configuration.IncludeErrorDetailPolicy = IncludeErrorDetailPolicy.Always; } } } diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Web.config b/Software/Visual_Studio/Web/Tango.MachineService/Web.config index 4a694f320..58a8c48af 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Web.config +++ b/Software/Visual_Studio/Web/Tango.MachineService/Web.config @@ -48,7 +48,17 @@ <authentication mode="Forms"> <forms defaultUrl="/Downloads/Index" loginUrl="/Account/Login" slidingExpiration="true" timeout="30"></forms> </authentication> + + <customErrors mode="On"/> </system.web> + + <!-- Override it for paths starting with api (your WebAPI) --> + <location path="api"> + <system.web> + <customErrors mode="Off" /> + </system.web> + </location> + <system.webServer> <handlers> <remove name="ExtensionlessUrlHandler-Integrated-4.0" /> |
