screwdriver-api 8.0.13 → 8.0.15

package/lib/server.js

@@ -9,12 +9,11 @@ process.on('unhandledRejection', (reason, p) => {
 });
 
 /**
- * If we're throwing errors, let's have them say a little more than just 500
- * @method prettyPrintErrors
+ * @method handlePreResponseLogs
  * @param  {Hapi.Request}    request Hapi Request object
  * @param  {Hapi.h}     h   Hapi Response Toolkit
  */
-function prettyPrintErrors(request, h) {
+function handlePreResponseLogs(request, h) {
     const { response } = request;
     const { release } = request.server.app;
 
@@ -22,31 +21,45 @@ function prettyPrintErrors(request, h) {
         h.state(release.cookieName, release.cookieValue);
     }
 
-    if (!response.isBoom) {
-        return h.continue;
-    }
+    // Pretty print errors
+    if (response.isBoom) {
+        const err = response;
+        const errName = err.output.payload.error;
+        const errMessage = err.message;
+        const { statusCode } = err.output.payload;
+        const stack = err.stack || errMessage;
+
+        // If we're throwing errors, let's have them say a little more than just 500
+        if (statusCode === 500) {
+            request.log(['server', 'error'], stack);
+        }
 
-    const err = response;
-    const errName = err.output.payload.error;
-    const errMessage = err.message;
-    const { statusCode } = err.output.payload;
-    const stack = err.stack || errMessage;
+        const res = {
+            statusCode,
+            error: errName,
+            message: errMessage
+        };
 
-    if (statusCode === 500) {
-        request.log(['server', 'error'], stack);
-    }
+        if (err.data) {
+            res.data = err.data;
+        }
 
-    const res = {
-        statusCode,
-        error: errName,
-        message: errMessage
-    };
+        return h.response(res).code(statusCode);
+    }
 
-    if (err.data) {
-        res.data = err.data;
+    // Log request payload when it takes longer than 5 seconds to respond
+    // This is to prevent logging payloads for every request
+    if (request.info && request.info.received && Date.now() - request.info.received > 5000 && request.payload) {
+        request.log(['payload'], {
+            method: request.method,
+            path: request.path,
+            payload: request.payload,
+            statusCode: request.response && request.response.statusCode,
+            responseTime: Date.now() - request.info.received
+        });
     }
 
-    return h.response(res).code(statusCode);
+    return h.continue;
 }
 
 /**
@@ -164,8 +177,7 @@ module.exports = async config => {
             });
         }
 
-        // Write prettier errors
-        server.ext('onPreResponse', prettyPrintErrors);
+        server.ext('onPreResponse', handlePreResponseLogs);
 
         // Audit log
         if (config.log && config.log.audit.enabled) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "8.0.13",
+  "version": "8.0.15",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {

package/plugins/builds/triggers/and.js

@@ -50,6 +50,42 @@ class AndTrigger extends JoinBase {
         return relatedBuilds;
     }
 
+    /**
+     * Get next build in the latest child evnet
+     * @param {Job} nextJob next job
+     * @returns {Promise<Build|null>}
+     */
+    async fetchNextBuildInChildEvents(nextJob) {
+        const childEvents = await this.eventFactory.list({
+            params: {
+                parentEventId: this.currentEvent.id,
+                pipelineId: this.pipelineId
+            }
+        });
+
+        if (childEvents.length === 0) {
+            return null;
+        }
+
+        const childEventBuilds = await this.buildFactory.list({
+            params: {
+                eventId: childEvents.map(e => e.id),
+                jobId: nextJob.id
+            }
+        });
+
+        if (childEventBuilds.length === 0) {
+            return null;
+        }
+
+        // Get the build of the latest evnet
+        const childEventNextBuild = childEventBuilds.reduce((l, r) => {
+            return l.eventId > r.eventId ? l : r;
+        });
+
+        return childEventNextBuild;
+    }
+
     /**
      * Trigger the next jobs of the current job
      * @param {Job} nextJob
@@ -63,28 +99,31 @@ class AndTrigger extends JoinBase {
         logger.info(`Fetching finished builds for event ${this.currentEvent.id}`);
 
         const relatedBuilds = await this.fetchRelatedBuilds();
-
-        // Find the next build from the related builds for this event
-        let nextBuild = relatedBuilds.find(b => b.jobId === nextJob.id && b.eventId === this.currentEvent.id);
-
-        if (!nextBuild) {
+        const childEventBuild = await this.fetchNextBuildInChildEvents(nextJob);
+        const groupEventsNextBuild = relatedBuilds.find(
+            b => b.jobId === nextJob.id && b.eventId > this.currentEvent.id
+        );
+        let currentEventNextBuild = relatedBuilds.find(
+            b => b.jobId === nextJob.id && b.eventId === this.currentEvent.id
+        );
+
+        // Find the next build of this event
+        if (!currentEventNextBuild) {
             // If the build to join fails and it succeeds on restart, depending on the timing, the latest build will be that of a child event.
             // In that case, `nextBuild` will be null and will not be triggered even though there is a build that should be triggered.
             // Now we need to check for the existence of a build that should be triggered in its own event.
-            nextBuild = await this.buildFactory.get({
+            currentEventNextBuild = await this.buildFactory.get({
                 eventId: this.currentEvent.id,
                 jobId: nextJob.id
             });
 
-            if (nextBuild) {
-                relatedBuilds.push(nextBuild);
+            if (currentEventNextBuild) {
+                relatedBuilds.push(currentEventNextBuild);
             }
         }
 
-        if (!nextBuild) {
-            // If the build to join is in the child event, its event id is greater than current event.
-            nextBuild = relatedBuilds.find(b => b.jobId === nextJob.id && b.eventId > this.currentEvent.id);
-        }
+        const nextBuild = childEventBuild || currentEventNextBuild || groupEventsNextBuild;
+
         const newParentBuilds = mergeParentBuilds(parentBuilds, relatedBuilds, this.currentEvent, undefined);
         let nextEvent = this.currentEvent;