Skip to content

Commit

Permalink
Nuget packages release
Browse files Browse the repository at this point in the history
Graphite 1.1.0.0
Graphite.Elmah 1.0.1.0
Graphite.Wcf 1.1.0.0

Fixes  #15
  • Loading branch information
peschuster committed Apr 24, 2014
1 parent 81438a3 commit 740db73
Show file tree
Hide file tree
Showing 18 changed files with 54 additions and 37 deletions.
Binary file modified source/.nuget/NuGet.exe
Binary file not shown.
4 changes: 2 additions & 2 deletions source/Graphite.Elmah/Graphite.Elmah.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<projectUrl>http://github.com/peschuster/graphite-client</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>ELMAH error filter for logging all exceptions to Graphite or StatsD.</description>
<releaseNotes>Initial release.</releaseNotes>
<copyright>Copyright 2012</copyright>
<releaseNotes>Update for compatibility with Graphite 1.1 - no functional changes.</releaseNotes>
<copyright>Copyright 2012-2014</copyright>
<tags>Elmah Graphite StatsD metrics monitoring</tags>
<dependencies>
<dependency id="Graphite" version="1.1" />
Expand Down
6 changes: 3 additions & 3 deletions source/Graphite.Elmah/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Peter Schuster")]
[assembly: AssemblyProduct("Graphite.Elmah")]
[assembly: AssemblyCopyright("Copyright © Peter Schuster 2012")]
[assembly: AssemblyCopyright("Copyright © Peter Schuster 2012-2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -34,5 +34,5 @@
// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern
// übernehmen, indem Sie "*" eingeben:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
2 changes: 1 addition & 1 deletion source/Graphite.System/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Peter Schuster")]
[assembly: AssemblyProduct("Graphite.System")]
[assembly: AssemblyCopyright("Copyright © Peter Schuster 2012")]
[assembly: AssemblyCopyright("Copyright © Peter Schuster 2012-2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
4 changes: 2 additions & 2 deletions source/Graphite.Wcf/Graphite.Wcf.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<projectUrl>http://github.com/peschuster/graphite-client</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Instrumentation of WCF services for reporting of hits and execution time to Graphite and StatsD.</description>
<releaseNotes>Initial release.</releaseNotes>
<copyright>Copyright 2012</copyright>
<releaseNotes>Update for compatibility with Graphite 1.1 - no functional changes.</releaseNotes>
<copyright>Copyright 2012-2014</copyright>
<tags>WCF Graphite StatsD metrics monitoring</tags>
<dependencies>
<dependency id="Graphite" version="1.1" />
Expand Down
4 changes: 2 additions & 2 deletions source/Graphite.Wcf/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle("Graphite.Wcf")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("Peter Schuster")]
[assembly: AssemblyProduct("Graphite.Wcf")]
[assembly: AssemblyCopyright("Copyright © 2012")]
[assembly: AssemblyCopyright("Copyright © Peter Schuster 2012-2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
3 changes: 3 additions & 0 deletions source/Graphite/Configuration/GraphiteElement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ public class GraphiteElement : ConfigurationElement, IGraphiteConfiguration
/// </summary>
internal const string TransportPropertyName = "transport";

/// <summary>
/// The XML name of the <see cref="PrefixKey"/> property.
/// </summary>
internal const string PrefixKeyPropertyName = "prefixKey";

/// <summary>
Expand Down
1 change: 0 additions & 1 deletion source/Graphite/Configuration/IStatsDConfiguration.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

namespace Graphite.Configuration
{
/// <summary>
Expand Down
3 changes: 3 additions & 0 deletions source/Graphite/Configuration/StatsDElement.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ public class StatsDElement : ConfigurationElement, IStatsDConfiguration
/// </summary>
internal const string PortPropertyName = "port";

/// <summary>
/// The XML name of the <see cref="PrefixKey"/> property.
/// </summary>
internal const string PrefixKeyPropertyName = "prefixKey";

/// <summary>
Expand Down
4 changes: 3 additions & 1 deletion source/Graphite/Graphite.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,9 @@
</None>
<None Include="web.config.transform" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="readme.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
5 changes: 3 additions & 2 deletions source/Graphite/Graphite.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
<projectUrl>http://github.com/peschuster/graphite-client</projectUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>Library for feeding data into Graphite and StatsD.</description>
<releaseNotes>Initial release.</releaseNotes>
<copyright>Copyright 2012</copyright>
<releaseNotes>Rename "StatsDProfiler" -> "MetricsPipe", use "long" as default metric data type.</releaseNotes>
<copyright>Copyright 2012-2014</copyright>
<tags>Graphite StatsD metrics monitoring</tags>
<dependencies />
</metadata>
<files>
<file src="web.config.transform" target="content\web.config.transform" />
<file src="readme.txt" target="" />
</files>
</package>
4 changes: 2 additions & 2 deletions source/Graphite/MetricsPipe.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
namespace Graphite
{
/// <summary>
/// Profiler for StatsD
/// Profiler for StatsD and Graphite
/// </summary>
public class MetricsPipe : IDisposable
{
Expand Down Expand Up @@ -35,7 +35,7 @@ internal MetricsPipe(GraphiteConfiguration configuration, IMetricsPipeProvider p
}

/// <summary>
/// Current instance of StatsD (might be null).
/// Current instance of MetricsPipe (might be null).
/// </summary>
public static MetricsPipe Current
{
Expand Down
2 changes: 1 addition & 1 deletion source/Graphite/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Peter Schuster")]
[assembly: AssemblyProduct("Graphite")]
[assembly: AssemblyCopyright("Copyright © Peter Schuster 2012")]
[assembly: AssemblyCopyright("Copyright © Peter Schuster 2012-2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand Down
6 changes: 6 additions & 0 deletions source/Graphite/StaticMetricsPipeProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,16 @@

namespace Graphite
{
/// <summary>
/// <see cref="IMetricsPipeProvider"/> with static lifetime for usage in self-hosted applications (e.g. console application).
/// </summary>
public class StaticMetricsPipeProvider : IMetricsPipeProvider
{
private static StaticMetricsPipeProvider instance;

/// <summary>
/// Static instance of this provider (singleton).
/// </summary>
public static StaticMetricsPipeProvider Instance
{
get
Expand Down
4 changes: 4 additions & 0 deletions source/Graphite/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Note:

The "StatsDProfiler" class was renamed to "MetricsPipe".
Therefore you have to rename all usages in your code as well.
15 changes: 7 additions & 8 deletions source/MvcWebTest/MvcWebTest.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
</Reference>
<Reference Include="Graphite">
<HintPath>..\packages\Graphite.1.1.0.0\lib\net40-Client\Graphite.dll</HintPath>
</Reference>
<Reference Include="Graphite.Elmah, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Graphite.Elmah.1.0.1.0\lib\net40\Graphite.Elmah.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -165,18 +172,10 @@
<Folder Include="Scripts\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Graphite.Elmah\Graphite.Elmah.csproj">
<Project>{1e287287-bdc9-40c3-940b-45b0f682955a}</Project>
<Name>Graphite.Elmah</Name>
</ProjectReference>
<ProjectReference Include="..\Graphite.Web\Graphite.Web.csproj">
<Project>{2a4858fe-7353-4e9a-84c1-1fd11808af39}</Project>
<Name>Graphite.Web</Name>
</ProjectReference>
<ProjectReference Include="..\Graphite\Graphite.csproj">
<Project>{e9ed1c85-2c0a-43a7-a98a-fc3ec92b6f8a}</Project>
<Name>Graphite</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
Expand Down
20 changes: 10 additions & 10 deletions source/MvcWebTest/Web.config
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<section name="errorMail" requirePermission="false" type="Elmah.ErrorMailSectionHandler, Elmah" />
<section name="errorFilter" requirePermission="false" type="Elmah.ErrorFilterSectionHandler, Elmah" />
</sectionGroup>
<section name="graphite" type="Graphite.Configuration.GraphiteConfiguration, Graphite" />
<section name="graphite.elmah" type="Graphite.Configuration.GraphiteElmahConfiguration, Graphite.Elmah" />
</configSections>


<section name="graphite" type="Graphite.Configuration.GraphiteConfiguration, Graphite" /><section name="graphite.elmah" type="Graphite.Configuration.GraphiteElmahConfiguration, Graphite.Elmah" /></configSections>
<connectionStrings>
<add name="DefaultConnection" providerName="System.Data.SqlClient" connectionString="Data Source=(LocalDb)\v11.0;Initial Catalog=aspnet-MvcWebTest-20120620014937;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|\aspnet-MvcWebTest-20120620014937.mdf" />
</connectionStrings>
Expand Down Expand Up @@ -101,12 +101,12 @@
more information on remote access and securing ELMAH.
-->
<security allowRemoteAccess="false" />
<errorFilter>

<errorFilter>
<test xmlns:my="http://schemas.microsoft.com/clr/nsassem/Graphite/Graphite.Elmah">
<my:log />
</test>
</errorFilter>
</elmah>
</errorFilter></elmah>
<location path="elmah.axd" inheritInChildApplications="false">
<system.web>
<httpHandlers>
Expand All @@ -128,9 +128,9 @@
</handlers>
</system.webServer>
</location>
<graphite xmlns="http://github.com/peschuster/Graphite/Configuration">


<graphite xmlns="http://github.com/peschuster/Graphite/Configuration">
<!--<graphite address="127.0.0.1" port="2003" transport="Tcp" />-->
<statsd address="127.0.0.1" port="8125" prefixKey="test" />
</graphite>
<graphite.elmah xmlns="http://github.com/peschuster/Graphite/Configuration" key="elmah_errors" type="counter" target="statsd" />
</configuration>
</graphite><graphite.elmah xmlns="http://github.com/peschuster/Graphite/Configuration" key="elmah_errors" type="counter" target="statsd" /></configuration>
4 changes: 2 additions & 2 deletions source/MvcWebTest/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<package id="elmah" version="1.2.2" targetFramework="net40" />
<package id="elmah.corelibrary" version="1.2.2" targetFramework="net40" />
<package id="EntityFramework" version="5.0.0-rc" />
<package id="Graphite" version="1.0.0.0" targetFramework="net40" />
<package id="Graphite.Elmah" version="1.0.0.0" targetFramework="net40" />
<package id="Graphite" version="1.1.0.0" targetFramework="net40" />
<package id="Graphite.Elmah" version="1.0.1.0" targetFramework="net40" />
<package id="jQuery" version="1.6.2" />
<package id="jQuery.UI.Combined" version="1.8.11" />
<package id="jQuery.Validation" version="1.8.1" />
Expand Down

0 comments on commit 740db73

Please sign in to comment.