Changeset 9549

Timestamp:

05/29/13 08:16:09 (12 years ago)

Author:

fschoepp

Message:

#1888:

• Removed unnecessary files from web project.
• Cleaned up slave.

Location:

branches/OaaS

Files:

• HeuristicLab.Clients.Hive.Slave.AzureClient/3.3/WorkerRole.cs (modified) (6 diffs)
• HeuristicLab.Services.Optimization.Web/Binders/AlgorithmJsonAttribute.cs (deleted)
• HeuristicLab.Services.Optimization.Web/Controllers/ChartController.cs (deleted)
• HeuristicLab.Services.Optimization.Web/Controllers/HomeController.cs (modified) (1 diff)
• HeuristicLab.Services.Optimization.Web/Controllers/OptimizationController.cs (deleted)
• HeuristicLab.Services.Optimization.Web/Controllers/StatusController.cs (deleted)
• HeuristicLab.Services.Optimization.Web/HeuristicLab.Services.Optimization.Web.csproj (modified) (3 diffs)
• HeuristicLab.Services.Optimization.Web/Views/Chart (deleted)
• HeuristicLab.Services.Optimization.Web/Views/Optimization (deleted)
• HeuristicLab.Services.Optimization.Web/Views/Status (deleted)

branches/OaaS/HeuristicLab.Clients.Hive.Slave.AzureClient/3.3/WorkerRole.cs

@@ -29 +29 @@
 using Microsoft.WindowsAzure.StorageClient;
 using System.Text;
+using System.Diagnostics;
 
 namespace HeuristicLab.Clients.Hive.Slave.AzureClient {
@@ -42 +43 @@
     public override void Run() {
       try {
-        LogError(new Exception("Starting Run()..."));
+        Trace.WriteLine("Starting Run()...");
         core = new HeuristicLab.Clients.Hive.SlaveCore.Core(false);
 
@@ -60 +61 @@
         });
 
-        LogError(new Exception("Run(): Core started successfullly"));
+        Trace.WriteLine("Run(): Core started successfullly");
         while (true) {
           Thread.Sleep(10000);
@@ -66 +67 @@
       }
       catch (Exception e) {
-        LogError(e);
-    throw e;
+        Trace.WriteLine(e.ToString());
+        throw e;
       }
     }
@@ -75 +76 @@
         ServicePointManager.DefaultConnectionLimit = 12;
         //core = new Core();
-        LogError(new Exception("Running OnStart()"));
+        Trace.WriteLine("Running OnStart()");
         try {
           if (!String.IsNullOrEmpty(RoleEnvironment.GetConfigurationSettingValue(Constants.DiagnosticsConnectionString))) {
@@ -88 +89 @@
           // -> diagnostics disabled
           // nothing more to do
-          LogError(ex);
+          Trace.WriteLine(ex.ToString());
         }
 
         RoleEnvironment.Changed += RoleEnvironmentChanged;
-        LogError(new Exception("Finished OnStart() successfullly"));
+        Trace.WriteLine("Finished OnStart() successfullly");
       }
       catch (Exception ex) {
-        LogError(ex);
-    throw ex;
+        Trace.WriteLine(ex.ToString());
+        throw ex;
       }
       return base.OnStart();
-    }
-
-    private void LogError(Exception e) {
-      var storageAccount = CloudStorageAccount.Parse(RoleEnvironment.GetConfigurationSettingValue(Constants.DiagnosticsConnectionString));
-      var blobClient = storageAccount.CreateCloudBlobClient();
-      var container = blobClient.GetContainerReference("slavelog");
-      container.CreateIfNotExist();
-      var guid = Guid.NewGuid();
-      var blob = container.GetBlobReference(guid.ToString());
-      var builder = new StringBuilder();
-      builder.Append("ToString: ").Append(e.ToString()).Append("\n");
-      builder.Append("Message: ").Append(e.Message).Append("\n");
-      blob.UploadText(builder.ToString());
     }
 

branches/OaaS/HeuristicLab.Services.Optimization.Web/Controllers/HomeController.cs

@@ -8 +8 @@
   public class HomeController : Controller {
     public ActionResult Index() {      
-      return RedirectToAction("Index", "Optimization");      
+      return RedirectToAction("Index", "Job");      
     }
 

branches/OaaS/HeuristicLab.Services.Optimization.Web/HeuristicLab.Services.Optimization.Web.csproj

@@ -124 +124 @@
     <Compile Include="Controllers\AdminController.cs" />
     <Compile Include="Controllers\BaseController.cs" />
-    <Compile Include="Controllers\ChartController.cs" />
     <Compile Include="Controllers\ExperimentController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\JobController.cs" />
-    <Compile Include="Controllers\OptimizationController.cs" />
-    <Compile Include="Controllers\StatusController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
@@ -313 +310 @@
     <Content Include="Views\Account\Register.cshtml" />
     <Content Include="Views\Admin\Index.cshtml" />
-    <Content Include="Views\Chart\GenerateChart.cshtml" />
     <Content Include="Views\Experiment\Edit.cshtml" />
     <Content Include="Views\Experiment\Index.cshtml" />
     <Content Include="Views\Home\About.cshtml" />
     <Content Include="Views\Home\Index.cshtml" />
-    <Content Include="Views\Optimization\AlgorithmParameters.cshtml" />
-    <Content Include="Views\Optimization\Index.cshtml">
-      <SubType>Code</SubType>
-    </Content>
-    <Content Include="Views\Optimization\JobDetails.cshtml" />
-    <Content Include="Views\Optimization\ProblemParameters.cshtml" />
-    <Content Include="Views\Optimization\ScheduleJob.cshtml" />
     <Content Include="Views\Shared\DisplayTemplates\AlgorithmParameters.cshtml" />
     <Content Include="Views\Shared\DisplayTemplates\BoolValue.cshtml" />
@@ -388 +377 @@
       <SubType>Designer</SubType>
     </None>
-    <Content Include="Views\Status\Index.cshtml" />
     <Content Include="Views\Experiment\New.cshtml" />
     <Content Include="Views\Experiment\NewEdit.cshtml" />