diff --git a/WebJEA/NLog.xsd b/WebJEA/NLog.xsd
index 6a7f71a..05684bd 100644
--- a/WebJEA/NLog.xsd
+++ b/WebJEA/NLog.xsd
@@ -37,12 +37,12 @@
- Global log level threshold for application log messages. Messages below this level won't be logged..
+ Global log level threshold for application log messages. Messages below this level won't be logged.
- Throw an exception when there is an internal error. Default value is: false.
+ Throw an exception when there is an internal error. Default value is: false. Not recommend to set to true in production!
@@ -72,7 +72,7 @@
- Perform mesage template parsing and formatting of LogEvent messages (true = Always, false = Never, empty = Auto Detect). Default value is: empty.
+ Perform message template parsing and formatting of LogEvent messages (true = Always, false = Never, empty = Auto Detect). Default value is: empty.
@@ -123,7 +123,7 @@
- Name of the logger. May include '*' character which acts like a wildcard. Allowed forms are: *, Name, *Name, Name* and *Name*
+ Name of the logger. May include wildcard characters ('*' or '?').
@@ -156,9 +156,9 @@
Ignore further rules if this one matches.
-
+
- Enable or disable logging rule. Disabled rules are ignored.
+ Rule identifier to allow rule lookup with Configuration.FindRuleByName and Configuration.RemoveRuleByName.
@@ -171,6 +171,11 @@
+
+
+ Default action if none of the filters match.
+
+
@@ -210,12 +215,19 @@
+
+
+
+ Variable value. Note, the 'value' attribute has precedence over this one.
+
+
+
Variable name.
-
+
Variable value.
@@ -340,6 +352,7 @@
+
@@ -357,6 +370,11 @@
Name of the target.
+
+
+ Only flush when LogEvent matches condition. Ignore explicit-flush, config-reload-flush and shutdown-flush
+
+
Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit
@@ -614,6 +632,7 @@
+
@@ -621,10 +640,11 @@
+
- Layout that should be use to calcuate the value for the parameter.
+ Layout that should be use to calculate the value for the parameter.
@@ -632,6 +652,11 @@
Viewer parameter name.
+
+
+ Whether an attribute with empty value should be included in the output
+
+
@@ -645,6 +670,7 @@
+
@@ -691,6 +717,11 @@
Indicates whether the error stream (stderr) should be used instead of the output stream (stdout).
+
+
+ Indicates whether to auto-check if the console has been redirected to file - Disables coloring logic when System.Console.IsOutputRedirected = true
+
+
Indicates whether to use default row highlighting rules.
@@ -1010,7 +1041,7 @@
- Layout that should be use to calcuate the value for the parameter.
+ Layout that should be use to calculate the value for the parameter.
@@ -1358,7 +1389,7 @@
- Value indicationg whether file creation calls should be synchronized by a system global mutex.
+ Indicates whether file creation calls should be synchronized by a system global mutex.
@@ -1532,6 +1563,7 @@
+
@@ -2927,7 +2959,7 @@
- Determines wether or not this attribute will be Json encoded.
+ Determines whether or not this attribute will be Json encoded.
@@ -2972,16 +3004,24 @@
+
+
+
Option to include all properties from the log events
+
+
+ Indicates whether to include call site (class and method name) in the information sent over the network.
+
+
Indicates whether to include contents of the dictionary.
@@ -3002,6 +3042,11 @@
Indicates whether to include contents of the stack.
+
+
+ Indicates whether to include source info (file name and line number) in the information sent over the network.
+
+
@@ -3107,7 +3152,7 @@
- Determines wether or not this attribute will be Xml encoded.
+ Determines whether or not this attribute will be Xml encoded.
@@ -3132,7 +3177,7 @@
- Determines wether or not this attribute will be Xml encoded.
+ Determines whether or not this attribute will be Xml encoded.
@@ -3162,7 +3207,7 @@
- Determines wether or not this attribute will be Xml encoded.
+ Determines whether or not this attribute will be Xml encoded.
diff --git a/WebJEA/Telemetry.vb b/WebJEA/Telemetry.vb
index 2285a39..d2cf9a5 100644
--- a/WebJEA/Telemetry.vb
+++ b/WebJEA/Telemetry.vb
@@ -35,18 +35,24 @@ Class Telemetry
Public Sub AddIDs(DomainSid As String, DomainDNSRoot As String, ScriptID As String, UserID As String, Optional Permitted As Boolean = True)
Dim oid As String = StringHash256(DomainSid & ";" & DomainDNSRoot.ToUpper())
+#If DEBUG Then
+ Add("orgid", "DEV")
+#Else
Add("orgid", oid)
+#End If
Add("scriptid", StringHash256(oid & ";" & ScriptID.ToUpper()))
Add("userid", StringHash256(oid & ";" & UserID.ToUpper()))
Add("permitted", Permitted)
End Sub
- Public Sub AddRuntime(SecondsRuntime As Single, Optional isOnload As Boolean = False)
+ Public Sub AddIsOnload(state As Boolean)
+ Add("IsOnload", state)
+ End Sub
+
+ Public Sub AddRuntime(SecondsRuntime As Single)
- Dim RuntimeName = "runtimesec"
- If isOnload Then RuntimeName = "runtimesecOnload"
- Add(RuntimeName, (Math.Ceiling(SecondsRuntime * 10D) / 10D).ToString()) 'round up to 1 decimal
+ Add("runtimesec", (Math.Ceiling(SecondsRuntime * 10D) / 10D).ToString()) 'round up to 1 decimal
End Sub
@@ -102,11 +108,11 @@ Class Telemetry
Dim wints As DateTime = DateTime.UtcNow
Dim ts As Integer = (wints - New DateTime(1970, 1, 1, 0, 0, 0)).TotalSeconds
- Dim version As String = "2" 'version of string format
+ Dim version As String = "3" 'version of string format
Add("wints", wints.ToString("yyyy-MM-dd hh:mm:ss"))
Add("unixts", ts)
- Add("version", version)
+ Add("msgversion", version)
End Sub
diff --git a/WebJEA/Web.config b/WebJEA/Web.config
index 99aae9b..809d7b0 100644
--- a/WebJEA/Web.config
+++ b/WebJEA/Web.config
@@ -35,7 +35,7 @@
- C:\prj\WebJEA CE\WebJEATest\configlocal.json
+ C:\prj\WebJEATest\configlocal.json
diff --git a/WebJEA/WebJEA.sln b/WebJEA/WebJEA.sln
index 00567b0..1c2ce9d 100644
--- a/WebJEA/WebJEA.sln
+++ b/WebJEA/WebJEA.sln
@@ -10,20 +10,26 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0327F3B9-9BEA-4F00-86A5-C7355A1FC5D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0327F3B9-9BEA-4F00-86A5-C7355A1FC5D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0327F3B9-9BEA-4F00-86A5-C7355A1FC5D0}.Debug|x64.ActiveCfg = Debug|x64
+ {0327F3B9-9BEA-4F00-86A5-C7355A1FC5D0}.Debug|x64.Build.0 = Debug|x64
{0327F3B9-9BEA-4F00-86A5-C7355A1FC5D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0327F3B9-9BEA-4F00-86A5-C7355A1FC5D0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0327F3B9-9BEA-4F00-86A5-C7355A1FC5D0}.Release|x64.ActiveCfg = Release|x64
+ {0327F3B9-9BEA-4F00-86A5-C7355A1FC5D0}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- BuildVersion_UseGlobalSettings = True
- BuildVersion_StartDate = 2000/1/1
SolutionGuid = {6AC2BC8A-23E5-4208-A7BD-C7BBA12AE5E9}
+ BuildVersion_StartDate = 2000/1/1
+ BuildVersion_UseGlobalSettings = True
EndGlobalSection
EndGlobal
diff --git a/WebJEA/WebJEA.vbproj b/WebJEA/WebJEA.vbproj
index 8809bba..6205944 100644
--- a/WebJEA/WebJEA.vbproj
+++ b/WebJEA/WebJEA.vbproj
@@ -1,6 +1,6 @@
-
+
@@ -85,20 +85,20 @@
- packages\AWSSDK.Core.3.3.101.6\lib\net45\AWSSDK.Core.dll
+ packages\AWSSDK.Core.3.3.103.52\lib\net45\AWSSDK.Core.dll
- packages\AWSSDK.SQS.3.3.100.15\lib\net45\AWSSDK.SQS.dll
+ packages\AWSSDK.SQS.3.3.102.19\lib\net45\AWSSDK.SQS.dll
packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll
- packages\NLog.4.6.3\lib\net45\NLog.dll
+ packages\NLog.4.6.7\lib\net45\NLog.dll
- packages\NLog.Web.4.8.2\lib\net35\NLog.Web.dll
+ packages\NLog.Web.4.9.0\lib\net35\NLog.Web.dll
@@ -116,12 +116,14 @@
+
+
@@ -283,13 +285,13 @@
-
- Designer
-
+
+ Designer
+
@@ -430,6 +432,28 @@
On
+
+ true
+ true
+ true
+ bin\
+ WebJEA.xml
+ 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
+ full
+ x64
+ true
+ false
+ MinimumRecommendedRules.ruleset
+
+
+ bin\
+ WebJEA.xml
+ true
+ 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022
+ pdbonly
+ x64
+ MinimumRecommendedRules.ruleset
+
@@ -461,7 +485,7 @@
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
-
+
diff --git a/WebJEA/default.aspx.vb b/WebJEA/default.aspx.vb
index fce162c..016ecbf 100644
--- a/WebJEA/default.aspx.vb
+++ b/WebJEA/default.aspx.vb
@@ -73,6 +73,8 @@
'add version to display
Try
lblVersion.Text = " v" + System.Reflection.Assembly.GetExecutingAssembly.GetName().Version.ToString(3)
+ objTelemetry.Add("appedition", "CE")
+ objTelemetry.Add("appversion", System.Reflection.Assembly.GetExecutingAssembly.GetName().Version.ToString(3))
Catch ex As Exception
End Try
@@ -116,7 +118,8 @@
ps.Script = cmd.OnloadScript
ps.LogParameters = cmd.LogParameters
ps.Run()
- objTelemetry.AddRuntime(ps.Runtime, isOnload:=True)
+ objTelemetry.AddRuntime(ps.Runtime)
+ objTelemetry.AddIsOnload(True)
consoleOnload.InnerHtml = psweb.ConvertToHTML(ps.getOutputData)
ps = Nothing
@@ -174,6 +177,7 @@
ps.Run()
objTelemetry.AddRuntime(ps.Runtime)
+ objTelemetry.AddIsOnload(False)
consoleOutput.Text = psweb.ConvertToHTML(ps.getOutputData)
ps = Nothing
diff --git a/WebJEA/packages.config b/WebJEA/packages.config
index 40f7945..ff488fe 100644
--- a/WebJEA/packages.config
+++ b/WebJEA/packages.config
@@ -1,16 +1,16 @@
-
-
+
+
-
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/WebJEA/startup.js b/WebJEA/startup.js
index d763f18..38e618f 100644
--- a/WebJEA/startup.js
+++ b/WebJEA/startup.js
@@ -17,4 +17,4 @@ $(function () {
window.location = $('a', this).attr('href');
return false;
});
-});
\ No newline at end of file
+});