merge commit
This commit is contained in:
commit
5db8bd0fa1
7 changed files with 72 additions and 45 deletions
|
@ -159,16 +159,17 @@ namespace WebsitePanel.EnterpriseServer
|
|||
{
|
||||
System.Threading.Thread.Sleep(1000);
|
||||
}
|
||||
|
||||
|
||||
counter++;
|
||||
}
|
||||
|
||||
// skip execution if the current task is still running
|
||||
scheduledTasks = TaskManager.GetScheduledTasks();
|
||||
if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
|
||||
{
|
||||
// run the schedule in the separate thread
|
||||
schedule.Run();
|
||||
// skip execution if the current task is still running
|
||||
scheduledTasks = TaskManager.GetScheduledTasks();
|
||||
if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId))
|
||||
{
|
||||
// run the schedule in the separate thread
|
||||
schedule.Run();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception Ex)
|
||||
|
@ -177,7 +178,7 @@ namespace WebsitePanel.EnterpriseServer
|
|||
{
|
||||
TaskManager.WriteError(string.Format("RunSchedule Error : {0}", Ex.Message));
|
||||
}
|
||||
catch(Exception)
|
||||
catch (Exception)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
</configSections>
|
||||
<!-- Connection strings -->
|
||||
<connectionStrings>
|
||||
<add name="EnterpriseServer" connectionString="server=2012PROV01;database=WebsitePanel;uid=WebsitePanel;pwd=5qc7ftf6q42byc08z857;Connection Timeout=60;" />
|
||||
<add name="EnterpriseServer" connectionString="Server=(local)\SQLExpress;Database=WebsitePanel;uid=sa;pwd=Password12" providerName="System.Data.SqlClient" />
|
||||
</connectionStrings>
|
||||
<appSettings>
|
||||
<!-- Encryption util settings -->
|
||||
<add key="WebsitePanel.CryptoKey" value="fbd61z4gwsc2m01x7xn2" />
|
||||
<add key="WebsitePanel.CryptoKey" value="1234567890" />
|
||||
<!-- A1D4KDHUE83NKHddF -->
|
||||
<add key="WebsitePanel.EncryptionEnabled" value="true" />
|
||||
<!-- Web Applications -->
|
||||
|
@ -18,10 +18,6 @@
|
|||
<!-- Maximum waiting time when sending request to the remote server
|
||||
The value is in seconds. "-1" - infinite. -->
|
||||
<add key="WebsitePanel.EnterpriseServer.ServerRequestTimeout" value="3600" />
|
||||
<!-- Alternative connection string, pulls the value from registry -->
|
||||
<add key="WebsitePanel.AltConnectionString" value="ConnectionString" />
|
||||
<add key="WebsitePanel.AltCryptoKey" value="CryptoKey" />
|
||||
<add key="WebsitePanel.DistableScheduler" value="false" />
|
||||
</appSettings>
|
||||
<system.web>
|
||||
<!-- Disable any authentication -->
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue