Skip to content

ApplicationName and TableName may be configured within connection string #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lsvhome wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ApplicationName and TableName may be configured within connection string #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 73 additions & 15 deletions src/Elmah.AzureTableStorage/AzureTableStorageErrorLog.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ namespace Elmah.AzureTableStorage
public class AzureTableStorageErrorLog : ErrorLog
{
private readonly CloudTable _cloudTable;
private const string TableName = "Elmah";

private static volatile string TableName = "Elmah";

private const int MaxAppNameLength = 60;

private const int MaxTableNameLength = 60;

/// <summary>
/// Initializes a new instance of the <see cref="AzureTableStorageErrorLog"/> class
/// using a dictionary of configured settings.
Expand All @@ -28,27 +31,45 @@ public AzureTableStorageErrorLog(IDictionary config)
if (config == null)
throw new ArgumentNullException("config");

var connectionString = ElmahHelper.GetConnectionString(config);
#region Read properties of ErrorLog config item

//
// If there is no connection string to use then throw an
// exception to abort construction.
// Set the application name as this implementation provides
// per-application isolation over a single store.
//

if (connectionString.Length == 0)
throw new ApplicationException("Connection string is missing for the Azure Table Storage error log.");

var cloudStorageAccount = CloudStorageAccount.Parse(connectionString);
var tableClient = cloudStorageAccount.CreateCloudTableClient();
_cloudTable = tableClient.GetTableReference(TableName);
_cloudTable.CreateIfNotExists();
var appName = config.Find("applicationName", string.Empty);

//
// Set the application name as this implementation provides
// per-application isolation over a single store.
// Set the table name. This implementation provides
// table-per-application-config isolation over a single store.
//

var appName = config.Find("applicationName", string.Empty);
var tableName = config.Find("tableName", string.Empty);

#endregion Read properties of ErrorLog config item

#region Read properties of ErrorLog connection string

var cfgBuilder = new System.Data.Common.DbConnectionStringBuilder();
var originalConnectionString = ElmahHelper.GetConnectionString(config);
cfgBuilder.ConnectionString = originalConnectionString;

// Try to override ApplicationName from connection string
if (cfgBuilder.ContainsKey("ApplicationName"))
{
appName = (string)cfgBuilder["ApplicationName"];
cfgBuilder.Remove("ApplicationName");
}

// Try to override TableName from connection string
if (cfgBuilder.ContainsKey("TableName"))
{
tableName = (string)cfgBuilder["TableName"];
cfgBuilder.Remove("TableName");
}

#endregion Read properties of ErrorLog connection string

if (appName.Length > MaxAppNameLength)
{
Expand All @@ -57,7 +78,44 @@ public AzureTableStorageErrorLog(IDictionary config)
MaxAppNameLength.ToString("N0")));
}

ApplicationName = appName;
if (tableName.Length > MaxTableNameLength)
{
throw new ApplicationException(string.Format(
"Table name is too long. Maximum length allowed is {0} characters.",
MaxTableNameLength.ToString("N0")));
}

if (!string.IsNullOrWhiteSpace(appName))
{
ApplicationName = appName;
}

if (!string.IsNullOrWhiteSpace(tableName))
{
TableName = tableName;
}

var newConnectionString = string.Join(";", originalConnectionString.Split(';').Where(item => !item.StartsWith("ApplicationName=", StringComparison.OrdinalIgnoreCase) && !item.StartsWith("TableName=", StringComparison.OrdinalIgnoreCase)));
var newConnectionStringBuilder = new System.Data.Common.DbConnectionStringBuilder();
newConnectionStringBuilder.ConnectionString = newConnectionString;

if (!cfgBuilder.EquivalentTo(newConnectionStringBuilder))
{
throw new ApplicationException("Connection string contains invalid parameters.");
}

//
// If there is no connection string to use then throw an
// exception to abort construction.
//

if (cfgBuilder.ConnectionString.Length == 0)
throw new ApplicationException("Connection string is missing for the Azure Table Storage error log.");

var cloudStorageAccount = CloudStorageAccount.Parse(newConnectionString);
var tableClient = cloudStorageAccount.CreateCloudTableClient();
_cloudTable = tableClient.GetTableReference(TableName);
_cloudTable.CreateIfNotExists();
}

/// <summary>
Expand Down