Skip to content
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

Jump to bottom

Improved some defaults for logging #5820

Merged
merged 6 commits into from
Oct 10, 2023
Merged

Improved some defaults for logging #5820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
356ae81
No Warning for moniker not found, when moniker is empty
skamphuis Sep 21, 2023
e78fbe2
No Warning for moniker not found, when moniker is empty
skamphuis Sep 21, 2023
8509a7b
In DDRMenu.FilterNodes only do GetTab when tabId > 0
skamphuis Sep 21, 2023
f9c6d60
BasicUrlRewriter: no log after redirect
skamphuis Sep 21, 2023
8ec5ce0
Fix missing braces
bdukes Oct 4, 2023
d056edf
Removed extra blank line
valadas Oct 4, 2023
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
10 changes: 5 additions & 5 deletions DNN Platform/DotNetNuke.Web.Mvc/StandardTabAndModuleInfoProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ private static int GetTabModuleInfoFromMoniker(string monikerValue)
if (ids != null && ids.Any())
{
return ids.First();
}

if (Logger.IsWarnEnabled)
{
Logger.WarnFormat("The specified moniker ({0}) is not defined in the system", monikerValue);
}
}

if (Logger.IsWarnEnabled)
{
Logger.WarnFormat("The specified moniker ({0}) is not defined in the system", monikerValue);
}

return Null.NullInteger;
}
}
Expand Down
8 changes: 4 additions & 4 deletions DNN Platform/DotNetNuke.Web/Api/StandardTabAndModuleInfoProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,11 @@ private static int GetTabModuleInfoFromMoniker(string monikerValue)
{
return ids.First();
}
}

if (Logger.IsWarnEnabled)
{
Logger.WarnFormat("The specified moniker ({0}) is not defined in the system", monikerValue);
if (Logger.IsWarnEnabled)
{
Logger.WarnFormat("The specified moniker ({0}) is not defined in the system", monikerValue);
}
}

return Null.NullInteger;
Expand Down
3 changes: 1 addition & 2 deletions DNN Platform/HttpModules/UrlRewrite/BasicUrlRewriter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,10 +223,9 @@ internal override void RewriteUrl(object sender, EventArgs e)
}
}
}
catch (ThreadAbortException exc)
catch (ThreadAbortException)
{
// Do nothing if Thread is being aborted - there are two response.redirect calls in the Try block
Logger.Debug(exc);
}
catch (Exception ex)
{
Expand Down
6 changes: 6 additions & 0 deletions DNN Platform/Modules/DDRMenu/MenuBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ private void FilterNodes(string nodeString, bool exclude)
this.RootNode.Children.FindAll(
n =>
{
// no need to check when the node is not a page
if (n.TabId <= 0)
{
return false;
}

var tab = TabController.Instance.GetTab(n.TabId, Null.NullInteger, false);
foreach (TabPermissionInfo perm in tab.TabPermissions)
{
Expand Down