markusthoemmes commented on a change in pull request #2957: splunk logstore URL: https://github.com/apache/incubator-openwhisk/pull/2957#discussion_r151354952
########## File path: common/scala/src/main/scala/whisk/core/containerpool/logging/LogDriverLogStore.scala ########## @@ -0,0 +1,70 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package whisk.core.containerpool.logging + +import akka.actor.ActorSystem +//import com.typesafe.config.ConfigObject +//import com.typesafe.config.ConfigList +//import com.typesafe.config.ConfigObject +import pureconfig.loadConfigOrThrow +//import scala.collection.JavaConverters._ +//import scala.collection.mutable +import scala.concurrent.Future +import whisk.common.TransactionId +import whisk.core.containerpool.Container +import whisk.core.entity.ActivationLogs +import whisk.core.entity.ExecutableWhiskAction +import whisk.core.entity.WhiskActivation +import pureconfig._ + +trait LogDriverLogStoreConfig { + def message: String + def dockerLogDriver: String + def dockerLogDriverOpts: Set[String] +} + +case class ConsumerlessLogDriverLogStoreConfig(message: String, + dockerLogDriver: String, + dockerLogDriverOpts: Set[String]) + extends LogDriverLogStoreConfig + +/** + * Docker log driver based LogStore impl. Uses docker log driver to emit container logs to an external store. + * Fetching logs from that external store is not provided in this trait. + */ +class LogDriverLogStore(actorSystem: ActorSystem, + config: LogDriverLogStoreConfig = + loadConfigOrThrow[ConsumerlessLogDriverLogStoreConfig]("whisk.logstore.log-driver")) + extends LogStore { + val logDriverMessage = config.message + val logParameters = + Map[String, Set[String]]("--log-driver" -> Set(config.dockerLogDriver)) ++ + Map[String, Set[String]]("--log-opt" -> config.dockerLogDriverOpts) Review comment: Why use 2 `Map`s? ```scala val logParameters = Map("--log-driver" -> Set(config.dockerLogDriver), "--log-opt" -> config.dockerLogDriverOpts) ``` Should work? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
