You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/01/10 15:30:12 UTC
[GitHub] mhenke1 closed pull request #3174: Change log level dynamically (updated)
mhenke1 closed pull request #3174: Change log level dynamically (updated)
URL: https://github.com/apache/incubator-openwhisk/pull/3174
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 955c8b1310..8cf58ece73 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -126,6 +126,8 @@ nginx:
verify_client: "{{ nginx_ssl_verify_client | default('off') }}"
wpn:
router: "{{ nginx_wpn_router | default('1') }}"
+ # an array of user ids to enable extra logging on the system
+ special_users: "{{ nginx_special_users | default('[]') }}"
# These are the variables to define all database relevant settings.
# The authKeys are the users, that are initially created to use OpenWhisk.
diff --git a/ansible/roles/nginx/templates/nginx.conf.j2 b/ansible/roles/nginx/templates/nginx.conf.j2
index 2212102bc8..f905cad40c 100644
--- a/ansible/roles/nginx/templates/nginx.conf.j2
+++ b/ansible/roles/nginx/templates/nginx.conf.j2
@@ -37,6 +37,20 @@ http {
keepalive 512;
}
+ map "$remote_user" $special_user {
+ default not_special;
+{% for user in nginx.special_users %}
+ "{{ user }}" special;
+{% endfor %}
+ }
+
+ map "$special_user:$http_x_ow_extra_logging" $extra_logging {
+ default "off";
+ "special:off" off;
+ "special:on" on;
+ "special:" on;
+ }
+
server {
listen 443 default ssl;
@@ -65,6 +79,7 @@ http {
if ($namespace) {
rewrite /(.*) /api/v1/web/${namespace}/$1 break;
}
+ proxy_set_header X-OW-EXTRA-LOGGING $extra_logging;
proxy_pass http://controllers;
proxy_read_timeout 75s; # 70+5 additional seconds to allow controller to terminate request
}
@@ -74,6 +89,7 @@ http {
if ($namespace) {
rewrite ^ /api/v1/web/${namespace}/public/index.html break;
}
+ proxy_set_header X-OW-EXTRA-LOGGING $extra_logging;
proxy_pass http://controllers;
proxy_read_timeout 75s; # 70+5 additional seconds to allow controller to terminate request
}
diff --git a/common/scala/src/main/scala/whisk/common/Logging.scala b/common/scala/src/main/scala/whisk/common/Logging.scala
index e63c824f30..873bcef81b 100644
--- a/common/scala/src/main/scala/whisk/common/Logging.scala
+++ b/common/scala/src/main/scala/whisk/common/Logging.scala
@@ -37,7 +37,11 @@ trait Logging {
* @param message Message to write to the log
*/
def debug(from: AnyRef, message: String)(implicit id: TransactionId = TransactionId.unknown) = {
- emit(DebugLevel, id, from, message)
+ if (id.meta.extraLogging) {
+ emit(InfoLevel, id, from, message)
+ } else {
+ emit(DebugLevel, id, from, message)
+ }
}
/**
diff --git a/common/scala/src/main/scala/whisk/common/TransactionId.scala b/common/scala/src/main/scala/whisk/common/TransactionId.scala
index 95e6eefc09..667643d0f6 100644
--- a/common/scala/src/main/scala/whisk/common/TransactionId.scala
+++ b/common/scala/src/main/scala/whisk/common/TransactionId.scala
@@ -24,13 +24,9 @@ import java.util.concurrent.atomic.AtomicInteger
import scala.math.BigDecimal.int2bigDecimal
import scala.util.Try
-
import akka.event.Logging.{InfoLevel, WarningLevel}
import akka.event.Logging.LogLevel
-import spray.json.JsArray
-import spray.json.JsNumber
-import spray.json.JsValue
-import spray.json.RootJsonFormat
+import spray.json._
/**
* A transaction id for tracking operations in the system that are specific to a request.
@@ -198,7 +194,7 @@ case class StartMarker(val start: Instant, startMarker: LogMarkerToken)
* negative for system operation and zero when originator is not known
* @param start the timestamp when the request processing commenced
*/
-protected case class TransactionMetadata(val id: Long, val start: Instant)
+protected case class TransactionMetadata(val id: Long, val start: Instant, val extraLogging: Boolean = false)
object TransactionId {
@@ -217,21 +213,29 @@ object TransactionId {
val controller = TransactionId(-130) // Controller startup
val dbBatcher = TransactionId(-140) // Database batcher
- def apply(tid: BigDecimal): TransactionId = {
+ def apply(tid: BigDecimal, extraLogging: Boolean = false): TransactionId = {
Try {
val now = Instant.now(Clock.systemUTC())
- TransactionId(TransactionMetadata(tid.toLong, now))
+ TransactionId(TransactionMetadata(tid.toLong, now, extraLogging))
} getOrElse unknown
}
implicit val serdes = new RootJsonFormat[TransactionId] {
- def write(t: TransactionId) = JsArray(JsNumber(t.meta.id), JsNumber(t.meta.start.toEpochMilli))
+ def write(t: TransactionId) = {
+ val baseJsArray = JsArray(JsNumber(t.meta.id), JsNumber(t.meta.start.toEpochMilli))
+ if (t.meta.extraLogging)
+ JsArray(baseJsArray, JsBoolean(t.meta.extraLogging))
+ else
+ baseJsArray
+ }
def read(value: JsValue) =
Try {
value match {
case JsArray(Vector(JsNumber(id), JsNumber(start))) =>
- TransactionId(TransactionMetadata(id.longValue, Instant.ofEpochMilli(start.longValue)))
+ TransactionId(TransactionMetadata(id.longValue, Instant.ofEpochMilli(start.longValue), false))
+ case JsArray(Vector(JsNumber(id), JsNumber(start), JsBoolean(extraLogging))) =>
+ TransactionId(TransactionMetadata(id.longValue, Instant.ofEpochMilli(start.longValue), extraLogging))
}
} getOrElse unknown
}
@@ -246,7 +250,7 @@ trait TransactionCounter {
private lazy val cnt = new AtomicInteger(numberOfInstances + instanceOrdinal)
- def transid(): TransactionId = {
- TransactionId(cnt.addAndGet(numberOfInstances))
+ def transid(extraLogging: Boolean = false): TransactionId = {
+ TransactionId(cnt.addAndGet(numberOfInstances), extraLogging)
}
}
diff --git a/common/scala/src/main/scala/whisk/http/BasicHttpService.scala b/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
index 798bb1eff8..8108002bdb 100644
--- a/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
+++ b/common/scala/src/main/scala/whisk/http/BasicHttpService.scala
@@ -27,8 +27,7 @@ import akka.http.scaladsl.model._
import akka.http.scaladsl.model.HttpRequest
import akka.http.scaladsl.server._
import akka.http.scaladsl.server.RouteResult.Rejected
-import akka.http.scaladsl.server.directives.DebuggingDirectives
-import akka.http.scaladsl.server.directives.LogEntry
+import akka.http.scaladsl.server.directives.{DebuggingDirectives, HeaderDirectives, LogEntry}
import akka.stream.ActorMaterializer
import spray.json._
import whisk.common.LogMarker
@@ -44,6 +43,8 @@ import whisk.common.MetricEmitter
*/
trait BasicHttpService extends Directives with TransactionCounter {
+ val OW_EXTRA_LOGGING_HEADER = "X-OW-EXTRA-LOGGING"
+
/**
* Gets the routes implemented by the HTTP service.
*
@@ -90,7 +91,13 @@ trait BasicHttpService extends Directives with TransactionCounter {
}
/** Assigns transaction id to every request. */
- protected val assignId = extract(_ => transid())
+ protected def assignId = HeaderDirectives.optionalHeaderValueByName(OW_EXTRA_LOGGING_HEADER) flatMap { headerValue =>
+ val extraLogging = headerValue match {
+ case Some(value) => value.toLowerCase == "on"
+ case None => false
+ }
+ extract(_ => transid(extraLogging))
+ }
/** Generates log entry for every request. */
protected def logRequestInfo(req: HttpRequest)(implicit tid: TransactionId): LogEntry = {
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services