Skip to content

Commit 6c2e4a3

Browse files
mathewcmathewc
committed
Moving FastLogger registration to WebHost
1 parent b906ebd commit 6c2e4a3

File tree

8 files changed

+20
-19
lines changed

8 files changed

+20
-19
lines changed

‎src/WebJobs.Script.NuGet/WebJobs.Script.nuspec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<dependencies>
1717
<dependency id="Microsoft.Azure.WebJobs" version="1.2.0-alpha-10306" />
1818
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="1.2.0-alpha-10306" />
19-
<dependency id="Microsoft.Azure.WebJobs.Logging" version="1.2.0-alpha-10306" />
2019
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="1.1.0-alpha-10287" />
2120
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.1.0-alpha-10287" />
2221
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-alpha-10287" />

‎src/WebJobs.Script/Diagnostics/FastLogger.cs‎ renamed to ‎src/WebJobs.Script.WebHost/Diagnostics/FastLogger.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
using System;
55
using System.Threading;
66
using System.Threading.Tasks;
7+
using Microsoft.Azure.WebJobs;
78
using Microsoft.Azure.WebJobs.Host.Loggers;
89
using Microsoft.Azure.WebJobs.Logging;
10+
using Microsoft.Azure.WebJobs.Script;
911
using Microsoft.WindowsAzure.Storage;
1012
using Newtonsoft.Json;
1113

12-
namespace Microsoft.Azure.WebJobs.Script.Diagnostics
14+
namespace WebJobs.Script.WebHost.Diagnostics
1315
{
1416
// Adapter for capturing SDK events and logging them to tables.
1517
internal class FastLogger : IAsyncCollector<FunctionInstanceLogEntry>

‎src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@
165165
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.1.2.0-alpha-10306\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
166166
<Private>True</Private>
167167
</Reference>
168+
<Reference Include="Microsoft.Azure.WebJobs.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
169+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.1.2.0-alpha-10306\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
170+
<Private>True</Private>
171+
</Reference>
168172
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
169173
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.1.2.0-alpha-10306\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
170174
<Private>True</Private>
@@ -296,6 +300,7 @@
296300
<Compile Include="Controllers\AdminController.cs" />
297301
<Compile Include="Controllers\FunctionsController.cs" />
298302
<Compile Include="Controllers\HomeController.cs" />
303+
<Compile Include="Diagnostics\FastLogger.cs" />
299304
<Compile Include="Diagnostics\IMetricsEventGenerator.cs" />
300305
<Compile Include="Diagnostics\MetricsEventGenerator.cs" />
301306
<Compile Include="Diagnostics\MetricsEventManager.cs" />

‎src/WebJobs.Script.WebHost/WebScriptHostManager.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
using System.Threading.Tasks;
1212
using Microsoft.AspNet.WebHooks;
1313
using Microsoft.Azure.WebJobs;
14+
using Microsoft.Azure.WebJobs.Host;
15+
using Microsoft.Azure.WebJobs.Host.Loggers;
1416
using Microsoft.Azure.WebJobs.Script;
1517
using Microsoft.Azure.WebJobs.Script.Description;
1618
using Microsoft.Azure.WebJobs.Script.Diagnostics;
@@ -137,6 +139,15 @@ protected override void OnInitializeConfig(JobHostConfiguration config)
137139

138140
// Add our WebHost specific services
139141
config.AddService<IMetricsLogger>(_metricsLogger);
142+
143+
// Register the new "FastLogger" for Dashboard support
144+
var dashboardString = AmbientConnectionStringProvider.Instance.GetConnectionString(ConnectionStringNames.Dashboard);
145+
if (dashboardString != null)
146+
{
147+
var fastLogger = new FastLogger(dashboardString);
148+
config.AddService<IAsyncCollector<FunctionInstanceLogEntry>>(fastLogger);
149+
}
150+
config.DashboardConnectionString = null; // disable slow logging
140151
}
141152

142153
protected override void OnHostStarted()

‎src/WebJobs.Script.WebHost/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-alpha-10287" targetFramework="net46" />
3636
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-alpha-10287" targetFramework="net46" />
3737
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.1.0-alpha-10287" targetFramework="net46" />
38+
<package id="Microsoft.Azure.WebJobs.Logging" version="1.2.0-alpha-10306" targetFramework="net46" />
3839
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="1.2.0-alpha-10306" targetFramework="net46" />
3940
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
4041
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />

‎src/WebJobs.Script/Host/ScriptHost.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using Microsoft.Azure.WebJobs.Extensions;
1515
using Microsoft.Azure.WebJobs.Host;
1616
using Microsoft.Azure.WebJobs.Host.Indexers;
17-
using Microsoft.Azure.WebJobs.Host.Loggers;
1817
using Microsoft.Azure.WebJobs.Script.Config;
1918
using Microsoft.Azure.WebJobs.Script.Description;
2019
using Microsoft.Azure.WebJobs.Script.Diagnostics;
@@ -174,16 +173,6 @@ protected virtual void Initialize()
174173
// take a snapshot so we can detect function additions/removals
175174
_directoryCountSnapshot = Directory.EnumerateDirectories(ScriptConfig.RootScriptPath).Count();
176175

177-
var dashboardString = AmbientConnectionStringProvider.Instance.GetConnectionString(ConnectionStringNames.Dashboard);
178-
179-
var config = ScriptConfig.HostConfig;
180-
if (dashboardString != null)
181-
{
182-
var fastLogger = new FastLogger(dashboardString);
183-
config.AddService<IAsyncCollector<FunctionInstanceLogEntry>>(fastLogger);
184-
}
185-
config.DashboardConnectionString = null; // disable slow logging
186-
187176
IMetricsLogger metricsLogger = ScriptConfig.HostConfig.GetService<IMetricsLogger>();
188177
if (metricsLogger == null)
189178
{

‎src/WebJobs.Script/WebJobs.Script.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,6 @@
9090
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.1.2.0-alpha-10306\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
9191
<Private>True</Private>
9292
</Reference>
93-
<Reference Include="Microsoft.Azure.WebJobs.Logging, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
94-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.1.2.0-alpha-10306\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
95-
<Private>True</Private>
96-
</Reference>
9793
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9894
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.1.2.0-alpha-10306\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
9995
<Private>True</Private>
@@ -286,7 +282,6 @@
286282
<Compile Include="Description\Binding\ServiceBusBindingMetadata.cs" />
287283
<Compile Include="Description\Binding\TableBindingMetadata.cs" />
288284
<Compile Include="Description\Binding\TimerBindingMetadata.cs" />
289-
<Compile Include="Diagnostics\FastLogger.cs" />
290285
<Compile Include="Diagnostics\FunctionStartedEvent.cs" />
291286
<Compile Include="Diagnostics\IMetricsLogger.cs" />
292287
<Compile Include="Diagnostics\MetricEvent.cs" />

‎src/WebJobs.Script/packages.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-alpha-10287" targetFramework="net46" />
1717
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-alpha-10287" targetFramework="net46" />
1818
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.1.0-alpha-10287" targetFramework="net46" />
19-
<package id="Microsoft.Azure.WebJobs.Logging" version="1.2.0-alpha-10306" targetFramework="net46" />
2019
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="1.2.0-alpha-10306" targetFramework="net46" />
2120
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
2221
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />

0 commit comments

Comments
 (0)