Changeset 7371

Timestamp:

01/19/12 15:15:15 (13 years ago)

Author:

spimming

Message:

#1680:

• start diagnostic monitor only when a connection string is specified
• constants file added

Location:

branches/HeuristicLab.Hive.Azure

Files:

• HeuristicLab.Clients.Hive.Slave.Azure/ServiceConfiguration.Cloud.cscfg (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Azure/ServiceConfiguration.Local.cscfg (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Azure/ServiceDefinition.build.csdef (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.Azure/ServiceDefinition.csdef (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.AzureClient/Constants.cs (added)
• HeuristicLab.Clients.Hive.Slave.AzureClient/HeuristicLab.Clients.Hive.Slave.AzureClient.csproj (modified) (1 diff)
• HeuristicLab.Clients.Hive.Slave.AzureClient/WorkerRole.cs (modified) (2 diffs)

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Azure/ServiceConfiguration.Cloud.cscfg

@@ -4 +4 @@
     <Instances count="1" />
     <ConfigurationSettings>
-      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="DefaultEndpointsProtocol=https;AccountName=hivestorage;AccountKey=Idq7D7dTvhpByPproP//rmdEaU5gmRxG62jAnJdghgzKqolnzsWjVTwNbg3p5BXVl86FuAXqvKlUAYFrMuSCMw==" />
       <Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.Enabled" value="true" />
       <Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.AccountUsername" value="hive" />

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Azure/ServiceConfiguration.Local.cscfg

@@ -4 +4 @@
     <Instances count="1" />
     <ConfigurationSettings>
-      <Setting name="Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString" value="UseDevelopmentStorage=true" />
       <Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.Enabled" value="true" />
       <Setting name="Microsoft.WindowsAzure.Plugins.RemoteAccess.AccountUsername" value="hive" />

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Azure/ServiceDefinition.build.csdef

@@ -12 +12 @@
   <WorkerRole name="HeuristicLab.Clients.Hive.Slave.AzureClient" vmsize="Small">
     <Imports>
-      <Import moduleName="Diagnostics" />
       <Import moduleName="RemoteAccess" />
       <Import moduleName="RemoteForwarder" />

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.Azure/ServiceDefinition.csdef

@@ -3 +3 @@
   <WorkerRole name="HeuristicLab.Clients.Hive.Slave.AzureClient" vmsize="Small">
     <Imports>
-      <Import moduleName="Diagnostics" />
       <Import moduleName="RemoteAccess" />
       <Import moduleName="RemoteForwarder" />

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.AzureClient/HeuristicLab.Clients.Hive.Slave.AzureClient.csproj

@@ -62 +62 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Constants.cs" />
     <Compile Include="WorkerRole.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive.Slave.AzureClient/WorkerRole.cs

@@ -18 +18 @@
       while (true) {
         Thread.Sleep(10000);
-        //Trace.WriteLine("Working", "Information");
       }
     }
@@ -25 +24 @@
       ServicePointManager.DefaultConnectionLimit = 12;
       core = new Core();
-
-      DiagnosticMonitorConfiguration dmc = DiagnosticMonitor.GetDefaultInitialConfiguration();
-      dmc.Logs.ScheduledTransferPeriod = TimeSpan.FromMinutes(1);
-      dmc.Logs.ScheduledTransferLogLevelFilter = LogLevel.Verbose;
-      DiagnosticMonitor.Start("Microsoft.WindowsAzure.Plugins.Diagnostics.ConnectionString", dmc);
+      try {
+        if (!String.IsNullOrEmpty(RoleEnvironment.GetConfigurationSettingValue(Constants.DiagnosticsConnectionString))) {
+          DiagnosticMonitorConfiguration dmc = DiagnosticMonitor.GetDefaultInitialConfiguration();
+          dmc.Logs.ScheduledTransferPeriod = TimeSpan.FromMinutes(1);
+          dmc.Logs.ScheduledTransferLogLevelFilter = LogLevel.Verbose;
+          DiagnosticMonitor.Start(Constants.DiagnosticsConnectionString, dmc);
+        }
+      }
+      catch (RoleEnvironmentException ex) {
+        //diagnostics connectio string not in configuration
+        //-> diagnostics disabled
+        //nothing more to do
+      }
 
       return base.OnStart();