@@ -23,7 +23,7 @@ class ScmRouter extends Scm {
2323 this . scms = { } ;
2424
2525 if ( typeof scmsConfig === 'object' ) {
26- Object . keys ( scmsConfig ) . forEach ( ( displayName ) => {
26+ Object . keys ( scmsConfig ) . forEach ( displayName => {
2727 const scm = scmsConfig [ displayName ] ;
2828
2929 if ( typeof scm !== 'object' ) {
@@ -95,17 +95,22 @@ class ScmRouter extends Scm {
9595 * @return {Promise } scm object
9696 */
9797 chooseWebhookScm ( headers , payload ) {
98- return new Promise ( ( resolve ) => {
98+ return new Promise ( resolve => {
9999 // choose a webhook scm module, or null if there is no suitable one
100- async . detect ( this . scms , ( scm , cb ) => {
101- scm . canHandleWebhook ( headers , payload )
102- . then ( ( result ) => {
103- cb ( result === false ? null : scm ) ;
104- } ) . catch ( ( err ) => {
105- logger . error ( err ) ;
106- cb ( null ) ;
107- } ) ;
108- } , ret => resolve ( ret ) ) ;
100+ async . detect (
101+ this . scms ,
102+ ( scm , cb ) => {
103+ scm . canHandleWebhook ( headers , payload )
104+ . then ( result => {
105+ cb ( result === false ? null : scm ) ;
106+ } )
107+ . catch ( err => {
108+ logger . error ( err ) ;
109+ cb ( null ) ;
110+ } ) ;
111+ } ,
112+ ret => resolve ( ret )
113+ ) ;
109114 } ) ;
110115 }
111116
@@ -204,16 +209,15 @@ class ScmRouter extends Scm {
204209 * @return {Promise }
205210 */
206211 _parseHook ( headers , payload ) {
207- return this . chooseWebhookScm ( headers , payload )
208- . then ( ( scm ) => {
209- if ( ! scm ) {
210- logger . info ( 'Webhook does not match any expected events or actions.' ) ;
212+ return this . chooseWebhookScm ( headers , payload ) . then ( scm => {
213+ if ( ! scm ) {
214+ logger . info ( 'Webhook does not match any expected events or actions.' ) ;
211215
212- return null ;
213- }
216+ return null ;
217+ }
214218
215- return scm . parseHook ( headers , payload ) ;
216- } ) ;
219+ return scm . parseHook ( headers , payload ) ;
220+ } ) ;
217221 }
218222
219223 /**
@@ -387,7 +391,7 @@ class ScmRouter extends Scm {
387391 stats ( ) {
388392 let result = { } ;
389393
390- Object . keys ( this . scms ) . forEach ( ( key ) => {
394+ Object . keys ( this . scms ) . forEach ( key => {
391395 result = Object . assign ( result , this . scms [ key ] . stats ( ) ) ;
392396 } ) ;
393397
@@ -411,8 +415,7 @@ class ScmRouter extends Scm {
411415 * @return {String } Full scmContext (e.g. github:github.com)
412416 */
413417 _getScmContext ( { hostname } ) {
414- return Object . keys ( this . scms ) . find ( scmContext =>
415- scmContext . split ( ':' ) [ 1 ] === hostname ) ;
418+ return Object . keys ( this . scms ) . find ( scmContext => scmContext . split ( ':' ) [ 1 ] === hostname ) ;
416419 }
417420
418421 /**
0 commit comments