diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs index 646542b4bf..f45de0ca7d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/cache/dispatcher.cs @@ -4,6 +4,7 @@ using System.Net; using System.Threading; using System.Xml; using Umbraco.Core; +using Umbraco.Core.Logging; using umbraco.BusinessLogic; using umbraco.interfaces; using umbraco.IO; @@ -179,11 +180,7 @@ namespace umbraco.presentation.cache private static void LogDispatchBatchError(Exception ee) { - Log.Add( - LogTypes.Error, - User.GetUser(0), - -1, - string.Format("Error refreshing distributed list: '{0}'", ee)); + LogHelper.Error("Error refreshing distributed list", ee); } private static void LogDispatchBatchResult(int errorCount) @@ -198,23 +195,13 @@ namespace umbraco.presentation.cache private static void LogDispatchNodeError(Exception ex) { - Log.Add( - LogTypes.Error, - User.GetUser(0), - -1, - string.Format("Error refreshing a node in the distributed list: '{0}'", ex)); + LogHelper.Error("Error refreshing a node in the distributed list", ex); } private static void LogDispatchNodeError(WebException ex) { string url = (ex.Response != null) ? ex.Response.ResponseUri.ToString() : "invalid url (responseUri null)"; - - Log.Add( - LogTypes.Error, - User.GetUser(0), - -1, - string.Format("Error refreshing a node in the distributed list: '{0}', URI attempted: {1}", ex, - url)); + LogHelper.Error("Error refreshing a node in the distributed list, URI attempted: " + url, ex); } /// diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs index f0969b0017..4d8740f32f 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/JTreeContextMenu.cs @@ -4,6 +4,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using System.Web.Script.Serialization; +using Umbraco.Core.Logging; using umbraco.interfaces; using System.Text.RegularExpressions; using umbraco.BusinessLogic.Actions; @@ -53,7 +54,7 @@ namespace umbraco.controls.Tree } catch (Exception ee) { - Log.Add(LogTypes.Error, -1, "Error initializing tree action: " + ee.ToString()); + LogHelper.Error("Error initializing tree action", ee); } } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs index 0090756230..71ff831841 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs @@ -4,6 +4,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using System.Web.Script.Serialization; +using Umbraco.Core.Logging; using umbraco.interfaces; using System.Text.RegularExpressions; using umbraco.BusinessLogic.Actions; @@ -313,29 +314,29 @@ namespace umbraco.controls.Tree public string GetLegacyIActionJavascript() { StringBuilder js = new StringBuilder(); - foreach (IAction a in global::umbraco.BusinessLogic.Actions.Action.GetAll()) - { - // NH: Added a try/catch block to this as an error in a 3rd party action can crash the whole menu initialization - try - { - if (!string.IsNullOrEmpty(a.Alias) && (!string.IsNullOrEmpty(a.JsFunctionName) || !string.IsNullOrEmpty(a.JsSource))) - { - // if the action is using invalid javascript we need to do something about this - if (!umbraco.BusinessLogic.Actions.Action.ValidateActionJs(a)) - { - js.AppendLine("function IActionProxy_" + umbraco.cms.helpers.Casing.SafeAlias(a.Alias) + "() {"); - js.AppendLine(umbraco.BusinessLogic.Actions.Action.ConvertLegacyJs(a.JsFunctionName)); // .Replace("openModal", "UmbClientMgr.openModalWindow")); - js.AppendLine("}"); - } - } - } - catch (Exception ee) - { - Log.Add(LogTypes.Error, -1, "Error initializing tree action: " + ee.ToString()); - } - } + foreach (IAction a in global::umbraco.BusinessLogic.Actions.Action.GetAll()) + { + // NH: Added a try/catch block to this as an error in a 3rd party action can crash the whole menu initialization + try + { + if (!string.IsNullOrEmpty(a.Alias) && (!string.IsNullOrEmpty(a.JsFunctionName) || !string.IsNullOrEmpty(a.JsSource))) + { + // if the action is using invalid javascript we need to do something about this + if (!umbraco.BusinessLogic.Actions.Action.ValidateActionJs(a)) + { + js.AppendLine("function IActionProxy_" + umbraco.cms.helpers.Casing.SafeAlias(a.Alias) + "() {"); + js.AppendLine(umbraco.BusinessLogic.Actions.Action.ConvertLegacyJs(a.JsFunctionName)); // .Replace("openModal", "UmbClientMgr.openModalWindow")); + js.AppendLine("}"); + } + } + } + catch (Exception ee) + { + LogHelper.Error("Error initializing tree action", ee); + } + } - if (js.Length != 0) + if (js.Length != 0) { js.Insert(0, "// This javascript is autogenerated by Umbraco to ensure legacy compatiblity with old context menu items\n\n"); } diff --git a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs index ba2b219c1b..bf87c90121 100644 --- a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs +++ b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs @@ -96,9 +96,9 @@ namespace umbraco.BasePages throw new UserAuthorizationException(String.Format("The current user doesn't have access to the section/app '{0}'", CurrentApp)); } } - catch (UserAuthorizationException) + catch (UserAuthorizationException ex) { - Log.Add(LogTypes.Error, CurrentUser, -1, String.Format("Tried to access '{0}'", CurrentApp)); + LogHelper.Error(String.Format("Tried to access '{0}'", CurrentApp), ex); throw; } catch diff --git a/src/umbraco.businesslogic/Log.cs b/src/umbraco.businesslogic/Log.cs index 4c24711385..86f38da8ce 100644 --- a/src/umbraco.businesslogic/Log.cs +++ b/src/umbraco.businesslogic/Log.cs @@ -2,7 +2,7 @@ using System; using System.Data; using System.Diagnostics; using System.Threading; - +using Umbraco.Core.Logging; using umbraco.DataLayer; using System.Collections.Generic; using System.Reflection; @@ -36,8 +36,7 @@ namespace umbraco.BusinessLogic } catch (Exception ee) { - Log.AddLocally(LogTypes.Error, User.GetUser(0), -1, - "Error loading external logger: " + ee.ToString()); + LogHelper.Error("Error loading external logger: " + ee.ToString(), ee); } } } @@ -103,6 +102,7 @@ namespace umbraco.BusinessLogic } } + [Obsolete("Use LogHelper to log exceptions/errors")] public void AddException(Exception ee) { if (ExternalLogger != null) @@ -119,7 +119,7 @@ namespace umbraco.BusinessLogic error += ex2.ToString(); ex2 = ex2.InnerException; } - Add(LogTypes.Error, -1, error); + LogHelper.Error("An error occurred", ee); } } diff --git a/src/umbraco.cms/Actions/Action.cs b/src/umbraco.cms/Actions/Action.cs index 34ff982eb2..4ae04e8b72 100644 --- a/src/umbraco.cms/Actions/Action.cs +++ b/src/umbraco.cms/Actions/Action.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Web; using System.Reflection; using Umbraco.Core; +using Umbraco.Core.Logging; using umbraco.BasePages; using umbraco.BusinessLogic.Utils; using umbraco.cms; @@ -103,8 +104,7 @@ namespace umbraco.BusinessLogic.Actions } catch (Exception iaExp) { - Log.Add(LogTypes.Error, User.GetUser(0), -1, string.Format("Error loading actionhandler '{0}': {1}", - ia.HandlerName(), iaExp)); + LogHelper.Error(string.Format("Error loading actionhandler '{0}'", ia.HandlerName()), iaExp); } } @@ -185,7 +185,7 @@ namespace umbraco.BusinessLogic.Actions } catch (Exception ee) { - Log.Add(LogTypes.Error, -1, "Error registrering action to javascript: " + ee.ToString()); + LogHelper.Error("Error registrering action to javascript", ee); } } diff --git a/src/umbraco.cms/businesslogic/Packager/Installer.cs b/src/umbraco.cms/businesslogic/Packager/Installer.cs index 62767d5a1f..f5a0b26563 100644 --- a/src/umbraco.cms/businesslogic/Packager/Installer.cs +++ b/src/umbraco.cms/businesslogic/Packager/Installer.cs @@ -264,7 +264,7 @@ namespace umbraco.cms.businesslogic.packager } catch (Exception ex) { - Log.Add(LogTypes.Error, -1, "Package install error: " + ex.ToString()); + LogHelper.Error("Package install error", ex); } } @@ -726,7 +726,7 @@ namespace umbraco.cms.businesslogic.packager } catch (Exception ee) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, u, dt.Id, "Packager: Error handling allowed templates: " + ee.ToString()); + LogHelper.Error("Packager: Error handling allowed templates", ee); } // Default template @@ -737,7 +737,7 @@ namespace umbraco.cms.businesslogic.packager } catch (Exception ee) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, u, dt.Id, "Packager: Error assigning default template: " + ee.ToString()); + LogHelper.Error("Packager: Error assigning default template", ee); } // Tabs @@ -829,7 +829,7 @@ namespace umbraco.cms.businesslogic.packager } catch (Exception ee) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, u, dt.Id, "Packager: Error assigning property to tab: " + ee.ToString()); + LogHelper.Error("Packager: Error assigning property to tab", ee); } } } diff --git a/src/umbraco.cms/businesslogic/Packager/PackageActions/addStringToHtmlElement.cs b/src/umbraco.cms/businesslogic/Packager/PackageActions/addStringToHtmlElement.cs index 4c17824945..99a0bf6b2e 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageActions/addStringToHtmlElement.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageActions/addStringToHtmlElement.cs @@ -28,7 +28,6 @@ namespace umbraco.cms.businesslogic.packager.standardPackageActions public bool Execute(string packageName, XmlNode xmlData) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, BusinessLogic.User.GetUser(0), -1, "executing addStringToHtmlElement"); string templateAlias = xmlData.Attributes["templateAlias"].Value; string htmlElementId = xmlData.Attributes["htmlElementId"].Value; diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs index c6cb53d9f0..5e2d887030 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Xml; using System.Web; - +using Umbraco.Core.Logging; using umbraco.cms.businesslogic.template; using umbraco.cms.businesslogic.web; using umbraco.cms.businesslogic.macro; @@ -92,187 +92,212 @@ namespace umbraco.cms.businesslogic.packager { CreatedPackage package = this; PackageInstance pack = package.Data; - - try { - PublishEventArgs e = new PublishEventArgs(); - package.FireBeforePublish(e); + try + { - if (!e.Cancel) { - int outInt = 0; + PublishEventArgs e = new PublishEventArgs(); + package.FireBeforePublish(e); - //Path checking... - string localPath = IOHelper.MapPath(IO.SystemDirectories.Media + "/" + pack.Folder); + if (!e.Cancel) + { + int outInt = 0; - if (!System.IO.Directory.Exists(localPath)) - System.IO.Directory.CreateDirectory(localPath); + //Path checking... + string localPath = IOHelper.MapPath(IO.SystemDirectories.Media + "/" + pack.Folder); - //Init package file... - createPackageManifest(); - //Info section.. - appendElement(utill.PackageInfo(pack, _packageManifest)); + if (!System.IO.Directory.Exists(localPath)) + System.IO.Directory.CreateDirectory(localPath); - //Documents... - int _contentNodeID = 0; - if (!String.IsNullOrEmpty(pack.ContentNodeId) && int.TryParse(pack.ContentNodeId, out _contentNodeID)) { - XmlNode documents = _packageManifest.CreateElement("Documents"); + //Init package file... + createPackageManifest(); + //Info section.. + appendElement(utill.PackageInfo(pack, _packageManifest)); - XmlNode documentSet = _packageManifest.CreateElement("DocumentSet"); - XmlAttribute importMode = _packageManifest.CreateAttribute("importMode", ""); - importMode.Value = "root"; - documentSet.Attributes.Append(importMode); - documents.AppendChild(documentSet); + //Documents... + int _contentNodeID = 0; + if (!String.IsNullOrEmpty(pack.ContentNodeId) && int.TryParse(pack.ContentNodeId, out _contentNodeID)) + { + XmlNode documents = _packageManifest.CreateElement("Documents"); - //load content from umbraco. - cms.businesslogic.web.Document umbDocument = new Document(_contentNodeID); - documentSet.AppendChild(umbDocument.ToXml(_packageManifest, pack.ContentLoadChildNodes)); + XmlNode documentSet = _packageManifest.CreateElement("DocumentSet"); + XmlAttribute importMode = _packageManifest.CreateAttribute("importMode", ""); + importMode.Value = "root"; + documentSet.Attributes.Append(importMode); + documents.AppendChild(documentSet); - appendElement(documents); - } + //load content from umbraco. + cms.businesslogic.web.Document umbDocument = new Document(_contentNodeID); + documentSet.AppendChild(umbDocument.ToXml(_packageManifest, pack.ContentLoadChildNodes)); - //Document types.. - List dtl = new List(); - XmlNode docTypes = _packageManifest.CreateElement("DocumentTypes"); - foreach (string dtId in pack.Documenttypes) { - if (int.TryParse(dtId, out outInt)) { - DocumentType docT = new DocumentType(outInt); + appendElement(documents); + } - AddDocumentType(docT, ref dtl); + //Document types.. + List dtl = new List(); + XmlNode docTypes = _packageManifest.CreateElement("DocumentTypes"); + foreach (string dtId in pack.Documenttypes) + { + if (int.TryParse(dtId, out outInt)) + { + DocumentType docT = new DocumentType(outInt); - } - } - foreach (DocumentType d in dtl) - { - docTypes.AppendChild(d.ToXml(_packageManifest)); - } + AddDocumentType(docT, ref dtl); - appendElement(docTypes); + } + } + foreach (DocumentType d in dtl) + { + docTypes.AppendChild(d.ToXml(_packageManifest)); + } - //Templates - XmlNode templates = _packageManifest.CreateElement("Templates"); - foreach (string templateId in pack.Templates) { - if (int.TryParse(templateId, out outInt)) { - Template t = new Template(outInt); - templates.AppendChild(t.ToXml(_packageManifest)); - } - } - appendElement(templates); + appendElement(docTypes); - //Stylesheets - XmlNode stylesheets = _packageManifest.CreateElement("Stylesheets"); - foreach (string ssId in pack.Stylesheets) { - if (int.TryParse(ssId, out outInt)) { - StyleSheet s = new StyleSheet(outInt); - stylesheets.AppendChild(s.ToXml(_packageManifest)); - } - } - appendElement(stylesheets); + //Templates + XmlNode templates = _packageManifest.CreateElement("Templates"); + foreach (string templateId in pack.Templates) + { + if (int.TryParse(templateId, out outInt)) + { + Template t = new Template(outInt); + templates.AppendChild(t.ToXml(_packageManifest)); + } + } + appendElement(templates); - //Macros - XmlNode macros = _packageManifest.CreateElement("Macros"); - foreach (string macroId in pack.Macros) { - if (int.TryParse(macroId, out outInt)) { - macros.AppendChild(utill.Macro(int.Parse(macroId), true, localPath, _packageManifest)); - } - } - appendElement(macros); + //Stylesheets + XmlNode stylesheets = _packageManifest.CreateElement("Stylesheets"); + foreach (string ssId in pack.Stylesheets) + { + if (int.TryParse(ssId, out outInt)) + { + StyleSheet s = new StyleSheet(outInt); + stylesheets.AppendChild(s.ToXml(_packageManifest)); + } + } + appendElement(stylesheets); - //Dictionary Items - XmlNode dictionaryItems = _packageManifest.CreateElement("DictionaryItems"); - foreach (string dictionaryId in pack.DictionaryItems) { - if (int.TryParse(dictionaryId, out outInt)) { - Dictionary.DictionaryItem di = new Dictionary.DictionaryItem(outInt); - dictionaryItems.AppendChild(di.ToXml(_packageManifest)); - } - } - appendElement(dictionaryItems); + //Macros + XmlNode macros = _packageManifest.CreateElement("Macros"); + foreach (string macroId in pack.Macros) + { + if (int.TryParse(macroId, out outInt)) + { + macros.AppendChild(utill.Macro(int.Parse(macroId), true, localPath, _packageManifest)); + } + } + appendElement(macros); - //Languages - XmlNode languages = _packageManifest.CreateElement("Languages"); - foreach (string langId in pack.Languages) { - if (int.TryParse(langId, out outInt)) { - language.Language lang = new umbraco.cms.businesslogic.language.Language(outInt); + //Dictionary Items + XmlNode dictionaryItems = _packageManifest.CreateElement("DictionaryItems"); + foreach (string dictionaryId in pack.DictionaryItems) + { + if (int.TryParse(dictionaryId, out outInt)) + { + Dictionary.DictionaryItem di = new Dictionary.DictionaryItem(outInt); + dictionaryItems.AppendChild(di.ToXml(_packageManifest)); + } + } + appendElement(dictionaryItems); - languages.AppendChild(lang.ToXml(_packageManifest)); - } - } - appendElement(languages); + //Languages + XmlNode languages = _packageManifest.CreateElement("Languages"); + foreach (string langId in pack.Languages) + { + if (int.TryParse(langId, out outInt)) + { + language.Language lang = new umbraco.cms.businesslogic.language.Language(outInt); - //Datatypes - XmlNode dataTypes = _packageManifest.CreateElement("DataTypes"); - foreach (string dtId in pack.DataTypes) { - if (int.TryParse(dtId, out outInt)) { - cms.businesslogic.datatype.DataTypeDefinition dtd = new umbraco.cms.businesslogic.datatype.DataTypeDefinition(outInt); - dataTypes.AppendChild(dtd.ToXml(_packageManifest)); - } - } - appendElement(dataTypes); + languages.AppendChild(lang.ToXml(_packageManifest)); + } + } + appendElement(languages); - //Files - foreach (string fileName in pack.Files) { - utill.AppendFileToManifest(fileName, localPath, _packageManifest); - } + //Datatypes + XmlNode dataTypes = _packageManifest.CreateElement("DataTypes"); + foreach (string dtId in pack.DataTypes) + { + if (int.TryParse(dtId, out outInt)) + { + cms.businesslogic.datatype.DataTypeDefinition dtd = new umbraco.cms.businesslogic.datatype.DataTypeDefinition(outInt); + dataTypes.AppendChild(dtd.ToXml(_packageManifest)); + } + } + appendElement(dataTypes); - //Load control on install... - if (!string.IsNullOrEmpty(pack.LoadControl)) { - XmlNode control = _packageManifest.CreateElement("control"); - control.InnerText = pack.LoadControl; - utill.AppendFileToManifest(pack.LoadControl, localPath, _packageManifest); - appendElement(control); - } + //Files + foreach (string fileName in pack.Files) + { + utill.AppendFileToManifest(fileName, localPath, _packageManifest); + } - //Actions - if (!string.IsNullOrEmpty(pack.Actions)) { - try { - XmlDocument xd_actions = new XmlDocument(); - xd_actions.LoadXml("" + pack.Actions + ""); - XmlNode actions = xd_actions.DocumentElement.SelectSingleNode("."); + //Load control on install... + if (!string.IsNullOrEmpty(pack.LoadControl)) + { + XmlNode control = _packageManifest.CreateElement("control"); + control.InnerText = pack.LoadControl; + utill.AppendFileToManifest(pack.LoadControl, localPath, _packageManifest); + appendElement(control); + } + + //Actions + if (!string.IsNullOrEmpty(pack.Actions)) + { + try + { + XmlDocument xd_actions = new XmlDocument(); + xd_actions.LoadXml("" + pack.Actions + ""); + XmlNode actions = xd_actions.DocumentElement.SelectSingleNode("."); - if (actions != null) { - actions = _packageManifest.ImportNode(actions, true).Clone(); - appendElement(actions); - } - } catch { } - } + if (actions != null) + { + actions = _packageManifest.ImportNode(actions, true).Clone(); + appendElement(actions); + } + } + catch { } + } - string manifestFileName = localPath + "/package.xml"; + string manifestFileName = localPath + "/package.xml"; - if (System.IO.File.Exists(manifestFileName)) - System.IO.File.Delete(manifestFileName); + if (System.IO.File.Exists(manifestFileName)) + System.IO.File.Delete(manifestFileName); - _packageManifest.Save(manifestFileName); - _packageManifest = null; + _packageManifest.Save(manifestFileName); + _packageManifest = null; - //string packPath = Settings.PackagerRoot.Replace(System.IO.Path.DirectorySeparatorChar.ToString(), "/") + "/" + pack.Name.Replace(' ', '_') + "_" + pack.Version.Replace(' ', '_') + "." + Settings.PackageFileExtension; + //string packPath = Settings.PackagerRoot.Replace(System.IO.Path.DirectorySeparatorChar.ToString(), "/") + "/" + pack.Name.Replace(' ', '_') + "_" + pack.Version.Replace(' ', '_') + "." + Settings.PackageFileExtension; - // check if there's a packages directory below media - string packagesDirectory = IO.SystemDirectories.Media + "/created-packages"; - if (!System.IO.Directory.Exists(IOHelper.MapPath(packagesDirectory))) - System.IO.Directory.CreateDirectory(IOHelper.MapPath(packagesDirectory)); + // check if there's a packages directory below media + string packagesDirectory = IO.SystemDirectories.Media + "/created-packages"; + if (!System.IO.Directory.Exists(IOHelper.MapPath(packagesDirectory))) + System.IO.Directory.CreateDirectory(IOHelper.MapPath(packagesDirectory)); - string packPath = packagesDirectory + "/" + (pack.Name + "_" + pack.Version).Replace(' ', '_') + "." + Settings.PackageFileExtension; - utill.ZipPackage(localPath, IOHelper.MapPath(packPath)); + string packPath = packagesDirectory + "/" + (pack.Name + "_" + pack.Version).Replace(' ', '_') + "." + Settings.PackageFileExtension; + utill.ZipPackage(localPath, IOHelper.MapPath(packPath)); - pack.PackagePath = packPath; + pack.PackagePath = packPath; - if (pack.PackageGuid.Trim() == "") - pack.PackageGuid = Guid.NewGuid().ToString(); + if (pack.PackageGuid.Trim() == "") + pack.PackageGuid = Guid.NewGuid().ToString(); - package.Save(); + package.Save(); - //Clean up.. - System.IO.File.Delete(localPath + "/package.xml"); - System.IO.Directory.Delete(localPath, true); + //Clean up.. + System.IO.File.Delete(localPath + "/package.xml"); + System.IO.Directory.Delete(localPath, true); - package.FireAfterPublish(e); - } + package.FireAfterPublish(e); + } - } catch (Exception ex) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, new BusinessLogic.User(0), -1, "CreatedPackage.cs " + ex.ToString()); - } + } + catch (Exception ex) + { + LogHelper.Error("An error occurred", ex); + } } private void AddDocumentType(DocumentType dt, ref List dtl) diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs index b4013d44ff..7a3ab5bf29 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/InstalledPackage.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Text; using System.Web; +using Umbraco.Core.Logging; using umbraco.IO; namespace umbraco.cms.businesslogic.packager { @@ -60,15 +61,18 @@ namespace umbraco.cms.businesslogic.packager { } public static bool isPackageInstalled(string packageGuid) { - try { - if (data.GetFromGuid(packageGuid, IOHelper.MapPath(Settings.InstalledPackagesSettings), true) == null) - return false; - else - return true; - } catch (Exception ex) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, 0, ex.ToString()); - return false; - } + try + { + if (data.GetFromGuid(packageGuid, IOHelper.MapPath(Settings.InstalledPackagesSettings), true) == null) + return false; + else + return true; + } + catch (Exception ex) + { + LogHelper.Error("An error occured in isPackagedInstalled", ex); + return false; + } } //EVENTS diff --git a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs index eb82658be5..eaf27ec2ef 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageInstance/PackageActions.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Web; using System.Xml; using Umbraco.Core; +using Umbraco.Core.Logging; using umbraco.BasePages; using umbraco.BusinessLogic.Utils; using umbraco.cms.businesslogic.web; @@ -41,8 +42,7 @@ namespace umbraco.cms.businesslogic.packager } catch (Exception ipaExp) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, BusinessLogic.User.GetUser(0), -1, string.Format("Error loading package action '{0}' for package {1}: {2}", - ipa.Alias(), packageName, ipaExp)); + LogHelper.Error(string.Format("Error loading package action '{0}' for package {1}", ipa.Alias(), packageName), ipaExp); } } } @@ -68,8 +68,7 @@ namespace umbraco.cms.businesslogic.packager } catch (Exception ipaExp) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, BusinessLogic.User.GetUser(0), -1, string.Format("Error undoing package action '{0}' for package {1}: {2}", - ipa.Alias(), packageName, ipaExp)); + LogHelper.Error(string.Format("Error undoing package action '{0}' for package {1}", ipa.Alias(), packageName), ipaExp); } } } diff --git a/src/umbraco.cms/businesslogic/Packager/data.cs b/src/umbraco.cms/businesslogic/Packager/data.cs index d1264d38fe..ceae03b0c3 100644 --- a/src/umbraco.cms/businesslogic/Packager/data.cs +++ b/src/umbraco.cms/businesslogic/Packager/data.cs @@ -150,7 +150,7 @@ namespace umbraco.cms.businesslogic.packager } catch (Exception ex) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, 0, ex.ToString()); + LogHelper.Error("An error occurred", ex); } return retVal; @@ -161,16 +161,19 @@ namespace umbraco.cms.businesslogic.packager } public static PackageInstance Package(string guid, string datasource) { - try { - XmlNode node = GetFromGuid(guid, datasource, true); - if(node != null) - return ConvertXmlToPackage(node); - else - return new PackageInstance(); - } catch(Exception ex) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, 0, ex.ToString()); - return new PackageInstance(); - } + try + { + XmlNode node = GetFromGuid(guid, datasource, true); + if (node != null) + return ConvertXmlToPackage(node); + else + return new PackageInstance(); + } + catch (Exception ex) + { + LogHelper.Error("An error occurred", ex); + return new PackageInstance(); + } } public static List GetAllPackages(string dataSource) { @@ -332,8 +335,7 @@ namespace umbraco.cms.businesslogic.packager } catch(Exception F) { - BusinessLogic.User myUser = new BusinessLogic.User(0); - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, myUser, 0, F.ToString()); + LogHelper.Error("An error occurred", F); } } diff --git a/src/umbraco.cms/businesslogic/language/Language.cs b/src/umbraco.cms/businesslogic/language/Language.cs index f98648e6d1..938cc14e55 100644 --- a/src/umbraco.cms/businesslogic/language/Language.cs +++ b/src/umbraco.cms/businesslogic/language/Language.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Data; using System.Globalization; using System.Xml; +using Umbraco.Core.Logging; using umbraco.cms.businesslogic.cache; using umbraco.DataLayer; using umbraco.BusinessLogic; @@ -297,9 +298,10 @@ namespace umbraco.cms.businesslogic.language } } else - { - Log.Add(LogTypes.Error, umbraco.BasePages.UmbracoEnsuredPage.CurrentUser, -1, "Could not remove Language " + _friendlyName + " because it's attached to a node"); - throw new DataException("Cannot remove language " + _friendlyName + " because it's attached to a domain on a node"); + { + var e = new DataException("Cannot remove language " + _friendlyName + " because it's attached to a domain on a node"); + LogHelper.Error("Cannot remove language " + _friendlyName + " because it's attached to a domain on a node", e); + throw e; } } diff --git a/src/umbraco.cms/businesslogic/macro/Macro.cs b/src/umbraco.cms/businesslogic/macro/Macro.cs index 6fc80ec556..1216c95f42 100644 --- a/src/umbraco.cms/businesslogic/macro/Macro.cs +++ b/src/umbraco.cms/businesslogic/macro/Macro.cs @@ -6,6 +6,7 @@ using System.Text.RegularExpressions; using System.Xml; using System.Runtime.CompilerServices; using Umbraco.Core.IO; +using Umbraco.Core.Logging; using umbraco.cms.businesslogic.cache; using umbraco.DataLayer; using umbraco.BusinessLogic; @@ -341,7 +342,7 @@ namespace umbraco.cms.businesslogic.macro } catch (Exception macroExp) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, BusinessLogic.User.GetUser(0), -1, "Error creating macro property: " + macroExp.ToString()); + LogHelper.Error("Error creating macro property", macroExp); } // macro properties @@ -372,7 +373,7 @@ namespace umbraco.cms.businesslogic.macro } catch (Exception macroPropertyExp) { - BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, BusinessLogic.User.GetUser(0), -1, "Error creating macro property: " + macroPropertyExp.ToString()); + LogHelper.Error("Error creating macro property", macroPropertyExp); } } diff --git a/src/umbraco.cms/businesslogic/media/UmbracoImageMediaFactory.cs b/src/umbraco.cms/businesslogic/media/UmbracoImageMediaFactory.cs index 4c5c25d6ff..e2412c0aa1 100644 --- a/src/umbraco.cms/businesslogic/media/UmbracoImageMediaFactory.cs +++ b/src/umbraco.cms/businesslogic/media/UmbracoImageMediaFactory.cs @@ -6,6 +6,7 @@ using System.Drawing.Imaging; using System.IO; using System.Linq; using System.Web; +using Umbraco.Core.Logging; using umbraco.BasePages; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.datatype; @@ -155,7 +156,7 @@ namespace umbraco.cms.businesslogic.media else { // Log error - Log.Add(LogTypes.Error, UmbracoEnsuredPage.CurrentUser, -1, "Multiple file upload: Can't find appropriate codec"); + LogHelper.Warn("Multiple file upload: Can't find appropriate codec"); } bp.Dispose(); diff --git a/src/umbraco.cms/businesslogic/skinning/Dependency.cs b/src/umbraco.cms/businesslogic/skinning/Dependency.cs index 27e7cb73eb..f8c0c6db23 100644 --- a/src/umbraco.cms/businesslogic/skinning/Dependency.cs +++ b/src/umbraco.cms/businesslogic/skinning/Dependency.cs @@ -5,6 +5,7 @@ using System.Text; using System.Xml; using System.Web; using System.Reflection; +using Umbraco.Core.Logging; namespace umbraco.cms.businesslogic.skinning { @@ -113,8 +114,7 @@ namespace umbraco.cms.businesslogic.skinning } catch (Exception ex) { - umbraco.BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, 0, - "Failed to load task type " + (taskNode.Attributes["type"] != null ? taskNode.Attributes["type"].Value : string.Empty) + ex.Message); + LogHelper.Error("Failed to load task type " + (taskNode.Attributes["type"] != null ? taskNode.Attributes["type"].Value : string.Empty), ex); } } diff --git a/src/umbraco.cms/businesslogic/skinning/Skin.cs b/src/umbraco.cms/businesslogic/skinning/Skin.cs index e498c413e1..82f493798f 100644 --- a/src/umbraco.cms/businesslogic/skinning/Skin.cs +++ b/src/umbraco.cms/businesslogic/skinning/Skin.cs @@ -5,6 +5,7 @@ using System.Text; using System.Xml; using System.IO; using System.Xml.XPath; +using Umbraco.Core.Logging; using umbraco.interfaces.skinning; namespace umbraco.cms.businesslogic.skinning @@ -86,13 +87,10 @@ namespace umbraco.cms.businesslogic.skinning } catch (Exception ex) { - umbraco.BusinessLogic.Log.Add(BusinessLogic.LogTypes.Error, 0, - "Failed to load dependency type " + (depNode.Attributes["type"] != null ? depNode.Attributes["type"].Value : string.Empty) + ex.Message); + LogHelper.Error("Failed to load dependency type " + (depNode.Attributes["type"] != null ? depNode.Attributes["type"].Value : string.Empty), ex); } } - - if (node.SelectSingleNode("/Skin/CSS") != null) s.Css = EmbeddedCss.CreateFromXmlNode(node.SelectSingleNode("/Skin/CSS")); diff --git a/src/umbraco.cms/businesslogic/template/Template.cs b/src/umbraco.cms/businesslogic/template/Template.cs index f1446d1e63..6dd45b2296 100644 --- a/src/umbraco.cms/businesslogic/template/Template.cs +++ b/src/umbraco.cms/businesslogic/template/Template.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Collections; using System.Xml; using Umbraco.Core; +using Umbraco.Core.Logging; using umbraco.DataLayer; using System.Text.RegularExpressions; using System.IO; @@ -535,9 +536,10 @@ namespace umbraco.cms.businesslogic.template { // don't allow template deletion if it has child templates if (this.HasChildren) - { - Log.Add(LogTypes.Error, this.Id, "Can't delete a master template. Remove any bindings from child templates first."); - throw new InvalidOperationException("Can't delete a master template. Remove any bindings from child templates first."); + { + var ex = new InvalidOperationException("Can't delete a master template. Remove any bindings from child templates first."); + LogHelper.Error