zydronium/websitepanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MySQL assembly loader fixed.

Browse source
This commit is contained in:
feodor_fitsner 2012-07-04 02:09:48 -07:00
parent 90219f284f
commit 326b32e769
1 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

52
WebsitePanel/Sources/WebsitePanel.Providers.Database.MySQL/MySqlServer.cs
View file

@ -148,24 +148,30 @@ namespace WebsitePanel.Providers.Database
Log.WriteInfo("Connector location is either null or empty");
return null;
}
//
string assemblyFile = String.Empty;
// Versions 5.x.x compatibility
if (connectorVersion.StartsWith("5."))
assemblyFile = Path.Combine(connectorLocation, @"Binaries\.NET 2.0\" + args.Name.Split(',')[0] + ".dll");
// Newest versions compatibility
else
assemblyFile = Path.Combine(connectorLocation, @"Assemblies\" + args.Name.Split(',')[0] + ".dll");
//
Log.WriteInfo(assemblyFile);
//
if (!File.Exists(assemblyFile))
{
Log.WriteInfo("Connector assembly could not be found or does not exist");
return null;
}
//
return Assembly.LoadFrom(assemblyFile);
string assemblyFile = args.Name.Split(',')[0] + ".dll";
// 1st location
string assemblyPath = Path.Combine(connectorLocation, @"Binaries\.NET 2.0\" + assemblyFile);
if (!File.Exists(assemblyPath))
{
// 2nd location
assemblyPath = Path.Combine(connectorLocation, @"Assemblies\" + assemblyFile);
if (!File.Exists(assemblyPath))
{
// 3rd location
assemblyPath = Path.Combine(connectorLocation, @"Assemblies\v2.0" + assemblyFile);
if (!File.Exists(assemblyPath))
{
Log.WriteInfo("Connector assembly could not be found or does not exist");
return null; // sorry, cannot find
}
}
}
return Assembly.LoadFrom(assemblyPath);
}
#endregion
@ -762,7 +768,15 @@ namespace WebsitePanel.Providers.Database
DataView dvProcesses = new DataView(dtProcesses);
foreach (DataRowView rowSid in dvProcesses)
{
ExecuteNonQuery(String.Format("KILL {0}", rowSid["Id"]));
string cmdText = String.Format("KILL {0}", rowSid["Id"]);
try
{
ExecuteNonQuery(cmdText);
}
catch(Exception ex)
{
Log.WriteError("Cannot drop MySQL connection: " + cmdText, ex);
}
}
}