This is an automated email from the ASF dual-hosted git repository.
mhenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 84f92cf Allow individual field sets for activation_record and
user_log (#4596)
84f92cf is described below
commit 84f92cf0768ed0b134e0bb7c99ed0cf400a39457
Author: ruediger maass <[email protected]>
AuthorDate: Fri Aug 30 13:31:55 2019 +0200
Allow individual field sets for activation_record and user_log (#4596)
* allow individual field sets for activation_record and user_log
* comment added to prevent accidental removal
* add result type to public methods
* changed return value to Unit
* remove unused import
---
.../openwhisk/core/database/ActivationFileStorage.scala | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git
a/common/scala/src/main/scala/org/apache/openwhisk/core/database/ActivationFileStorage.scala
b/common/scala/src/main/scala/org/apache/openwhisk/core/database/ActivationFileStorage.scala
index 23036ff..7bcc471 100644
---
a/common/scala/src/main/scala/org/apache/openwhisk/core/database/ActivationFileStorage.scala
+++
b/common/scala/src/main/scala/org/apache/openwhisk/core/database/ActivationFileStorage.scala
@@ -106,13 +106,21 @@ class ActivationFileStorage(logFilePrefix: String,
ByteString(s"${line.compactPrint}\n")
}
- def getLogFile = logFile
+ def getLogFile: Path = logFile
def activationToFile(activation: WhiskActivation,
context: UserContext,
- additionalFields: Map[String, JsValue] = Map.empty) = {
- val transcribedLogs = transcribeLogs(activation, additionalFields)
- val transcribedActivation = transcribeActivation(activation,
additionalFields)
+ additionalFields: Map[String, JsValue] = Map.empty):
Unit = {
+ activationToFileExtended(activation, context, additionalFields,
additionalFields)
+ }
+
+ // used by external ArtifactActivationStore SPI implementation
+ def activationToFileExtended(activation: WhiskActivation,
+ context: UserContext,
+ additionalFieldsForLogs: Map[String, JsValue] =
Map.empty,
+ additionalFieldsForActivation: Map[String,
JsValue] = Map.empty): Unit = {
+ val transcribedLogs = transcribeLogs(activation, additionalFieldsForLogs)
+ val transcribedActivation = transcribeActivation(activation,
additionalFieldsForActivation)
// Write each log line to file and then write the activation metadata
Source
