Added support for multiplexed logs

Author: timt

src/Docker.DotNet/Endpoints/ISwarmOperations.cs

@@ -158,7 +158,7 @@ public interface ISwarmOperations
         /// <summary>
         /// Get service logs.
         ///
-        /// Get {stdout} and {stderr} logs from a container.
+        /// Get {stdout} and {stderr} logs from all service tasks.
         /// Note: This endpoint works only for services with the {json-file} or {journald} logging driver.
         /// </summary>
         /// <remarks>
@@ -175,6 +175,17 @@ public interface ISwarmOperations
         /// <param name="id">ID or name of the service.</param>
         Task<Stream> GetServiceLogsAsync(string id, ServiceLogsParameters parameters, CancellationToken cancellationToken = default(CancellationToken));
 
+        /// <summary>
+        /// Gets the <code>stdout</code> and <code>stderr</code> logs from all service tasks.
+        /// This endpoint works only for services with the <code>json-file</code> or <code>journald</code> logging driver.
+        /// </summary>
+        /// <param name="id">ID or name of the service.</param>
+        /// <param name="tty">If the service was created with a TTY or not. If <see langword="false" />, the returned stream is multiplexed.</param>
+        /// <param name="parameters">The parameters used to retrieve the logs.</param>
+        /// <param name="cancellationToken">A token used to cancel this operation.</param>
+        /// <returns>A stream with the retrieved logs. If the service wasn't created with a TTY, this stream is multiplexed.</returns>
+        Task<MultiplexedStream> GetServiceLogsAsync(string id, bool tty, ServiceLogsParameters parameters, CancellationToken cancellationToken = default(CancellationToken));
+
         #endregion Services
 
         #region Nodes

src/Docker.DotNet/Endpoints/SwarmOperations.cs

@@ -173,6 +173,25 @@ async Task<ServiceUpdateResponse> ISwarmOperations.UpdateServiceAsync(string id,
             return this._client.MakeRequestForStreamAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"services/{id}/logs", queryParameters, cancellationToken);
         }
 
+        public async Task<MultiplexedStream> GetContainerLogsAsync(string id, bool tty, ServiceLogsParameters parameters, CancellationToken cancellationToken = default(CancellationToken))
+        {
+            if (string.IsNullOrEmpty(id))
+            {
+                throw new ArgumentNullException(nameof(id));
+            }
+
+            if (parameters == null)
+            {
+                throw new ArgumentNullException(nameof(parameters));
+            }
+
+            IQueryString queryParameters = new QueryString<ServiceLogsParameters>(parameters);
+
+            Stream result = await this._client.MakeRequestForStreamAsync(new[] { SwarmResponseHandler }, HttpMethod.Get, $"services/{id}/logs", queryParameters, cancellationToken).ConfigureAwait(false);
+
+            return new MultiplexedStream(result, !tty);
+        }
+
         async Task ISwarmOperations.UpdateSwarmAsync(SwarmUpdateParameters parameters, CancellationToken cancellationToken)
         {
             var query = new QueryString<SwarmUpdateParameters>(parameters ?? throw new ArgumentNullException(nameof(parameters)));