Users/srkidd/enable stream and file output

src/Agent.Listener/CommandLine/ConfigureAgent.cs

@@ -60,6 +60,9 @@ public class ConfigureAgent : ConfigureOrRemoveBase
         [Option(Constants.Agent.CommandLine.Flags.DisableLogUploads)]
         public bool DisableLogUploads { get; set; }
 
+        [Option(Constants.Agent.CommandLine.Flags.EnableLogOutput)]
+        public bool EnableLogOutput { get; set; }
+
         [Option(Constants.Agent.CommandLine.Flags.MachineGroup)]
         public bool MachineGroup { get; set; }
 

src/Agent.Listener/CommandSettings.cs

@@ -570,6 +570,11 @@ public bool GetDisableLogUploads()
             return TestFlag(Configure?.DisableLogUploads, Constants.Agent.CommandLine.Flags.DisableLogUploads);
         }
 
+        public bool GetEnableLogOutput()
+        {
+            return TestFlag(Configure?.EnableLogOutput, Constants.Agent.CommandLine.Flags.EnableLogOutput);
+        }
+
         public bool Unattended()
         {
             if (TestFlag(GetConfigureOrRemoveBase()?.Unattended, Constants.Agent.CommandLine.Flags.Unattended))

src/Agent.Listener/Configuration/ConfigurationManager.cs

@@ -397,8 +397,17 @@ public async Task ConfigureAsync(CommandSettings command)
 
             agentSettings.NotificationSocketAddress = command.GetNotificationSocketAddress();
 
+            // Test to see if disableLogUpload and enabledLogOutput are both selected
+            if (command.GetDisableLogUploads() && command.GetEnableLogOutput())
+            {
+                Trace.Warning("You cannot use --disableloguploads and --enablelogoutput at the same time!");
+                throw new NotSupportedException();
+            }
+
             agentSettings.DisableLogUploads = command.GetDisableLogUploads();
 
+            agentSettings.EnableLogOutput = command.GetEnableLogOutput();
+
             agentSettings.AlwaysExtractTask = command.GetAlwaysExtractTask();
 
             _store.SaveSettings(agentSettings);
@@ -736,7 +745,7 @@ private void CheckAgentRootDirectorySecure()
                     // Get info about root folder
                     DirectoryInfo dirInfo = new DirectoryInfo(rootDirPath);
 
-                    // Get directory access control list 
+                    // Get directory access control list
                     DirectorySecurity directorySecurityInfo = dirInfo.GetAccessControl();
                     AuthorizationRuleCollection dirAccessRules = directorySecurityInfo.GetAccessRules(true, true, typeof(NTAccount));
 

src/Agent.Worker/ExecutionContext.cs

@@ -118,6 +118,7 @@ public sealed class ExecutionContext : AgentService, IExecutionContext, IDisposa
         private ExecutionTargetInfo _defaultStepTarget;
         private ExecutionTargetInfo _currentStepTarget;
         private bool _disableLogUploads;
+        private bool _enableLogOutput;
         private string _buildLogsFolderPath;
         private string _buildLogsFile;
         private FileStream _buildLogsData;
@@ -180,8 +181,9 @@ public override void Initialize(IHostContext hostContext)
             base.Initialize(hostContext);
 
             _disableLogUploads = HostContext.GetService<IConfigurationStore>().GetSettings().DisableLogUploads;
+            _enableLogOutput = HostContext.GetService<IConfigurationStore>().GetSettings().EnableLogOutput;
 
-            if (_disableLogUploads)
+            if (_disableLogUploads || _enableLogOutput)
             {
                 _buildLogsFolderPath = Path.Combine(hostContext.GetDiagDirectory(), _buildLogsFolderName);
                 Directory.CreateDirectory(_buildLogsFolderPath);
@@ -264,7 +266,7 @@ public void Start(string currentOperation = null)
 
             _jobServerQueue.QueueTimelineRecordUpdate(_mainTimelineId, _record);
 
-            if (_disableLogUploads)
+            if (_disableLogUploads || _enableLogOutput)
             {
                 var buildLogsJobFolder = Path.Combine(_buildLogsFolderPath, _mainTimelineId.ToString());
                 Directory.CreateDirectory(buildLogsJobFolder);
@@ -276,7 +278,15 @@ public void Start(string currentOperation = null)
                 _buildLogsData = new FileStream(_buildLogsFile, FileMode.CreateNew);
                 _buildLogsWriter = new StreamWriter(_buildLogsData, System.Text.Encoding.UTF8);
 
-                _logger.Write(StringUtil.Loc("BuildLogsMessage", _buildLogsFile));
+                if (_disableLogUploads)
+                {
+                    _logger.Write(StringUtil.Loc("BuildLogsMessage", _buildLogsFile));
+                }
+                else
+                {
+                    _logger.Write(StringUtil.Loc("LogOutputMessage", _buildLogsFile));
+                }
+
             }
         }
 
@@ -287,7 +297,7 @@ public TaskResult Complete(TaskResult? result = null, string currentOperation =
                 Result = result;
             }
 
-            if (_disableLogUploads)
+            if (_disableLogUploads || _enableLogOutput)
             {
                 _buildLogsWriter.Flush();
                 _buildLogsData.Flush();
@@ -717,9 +727,17 @@ public long Write(string tag, string inputMessage, bool canMaskSecrets = true)
             {
                 totalLines = _logger.TotalLines + 1;
 
+                DateTime rightNow = DateTime.UtcNow;
+
                 if (_disableLogUploads)
                 {
-                    _buildLogsWriter.WriteLine(message);
+                    //Add date time stamp to log line
+                    _buildLogsWriter.WriteLine("{0:O} {1}", rightNow, message);
+                }
+                else if (_enableLogOutput) {
+                    //Add date time stamp to log line
+                    _buildLogsWriter.WriteLine("{0:O} {1}", rightNow, message);
+                     _logger.Write(message);
                 }
                 else
                 {

src/Microsoft.VisualStudio.Services.Agent/ConfigurationStore.cs

@@ -89,6 +89,9 @@ public string Fingerprint
         [DataMember(EmitDefaultValue = false)]
         public bool DisableLogUploads { get; set; }
 
+        [DataMember(EmitDefaultValue = false)]
+        public bool EnableLogOutput { get; set; }
+
         [DataMember(EmitDefaultValue = false)]
         public int PoolId { get; set; }
 

src/Microsoft.VisualStudio.Services.Agent/Constants.cs

@@ -220,6 +220,7 @@ public static class Flags
                     public const string GitUseSChannel = "gituseschannel";
                     public const string Help = "help";
                     public const string DisableLogUploads = "disableloguploads";
+                    public const string EnableLogOutput = "enablelogoutput";
                     public const string MachineGroup = "machinegroup";
                     public const string Replace = "replace";
                     public const string NoRestart = "norestart";

src/Misc/layoutbin/en-US/strings.json

@@ -136,6 +136,8 @@
     " --acceptTeeEula                   macOS and Linux only. Accept the TEE end user license agreement.",
     " --gitUseSChannel                  Windows only. Tell Git to use Windows' native cert store.",
     " --alwaysExtractTask               Perform an unzip for tasks for each pipeline step.",
+    " --disableLogUploads               Don't stream or send console log output to the server. Instead, you may retrieve them from the agent host's filesystem after the job completes. NOTE: Cannot be used with --enableLogOutput, it will cause an error.",
+    " --enableLogOutput                 Stream or send console log output to the server as well as a log file on the agent host's filesystem. NOTE: Cannot be used with --disableLogUploads, it will cause an error.",
     "",
     "CLI-WIDTH-OPTIONS-(35-CHARS)-------CLI-WIDTH-DESCRIPTION-(70-CHARS)--------------------------------------",
     "Startup options (Windows only):",
@@ -395,6 +397,7 @@
   "ListenForJobs": "{0:u}: Listening for Jobs",
   "LocalClockSkewed": "The local machine's clock may be out of sync with the server time by more than five minutes. Please sync your clock with your domain or internet time and try again.",
   "LocalSystemAccountNotFound": "Cannot find local system account",
+  "LogOutputMessage": "The agent has enabled uploading logs as well as saving log to file. After the job completes, you can retrieve this step's logs at {0} on the agent.",
   "Maintenance": "Maintenance",
   "MaxHierarchyLevelReached": "Hierarchy level is more than supported limit {0}, truncating lower hierarchy.",
   "MaxSubResultLimitReached": "Number of subresults in test case '{0}' is more than the supported limit of {1}, truncating remaining ones.",