@@ -119,8 +119,11 @@ function setup(options, imports, register, app) {
119
119
var command = rjs + " -o baseUrl=" + addonPath + " paths.require-tools=" + requiretoolsPath + " name=" + main + " map.*.css=require-tools/css/css map.*.less=require-tools/less/less out=" + output ;
120
120
121
121
// Run optimization
122
- logger . log ( "Optimizing" , addon . name , command ) ;
123
- return Q . nfcall ( exec , command ) . fail ( function ( err ) {
122
+ logger . log ( "Optimizing" , addon . name ) ;
123
+ return Q . nfcall ( exec , command ) . then ( function ( ) {
124
+ logger . log ( "Finished" , addon . name , "optimization" ) ;
125
+ return Q ( output ) ;
126
+ } , function ( err ) {
124
127
logger . error ( "error for" , addon . name ) ;
125
128
logger . exception ( err , false ) ;
126
129
return Q . reject ( err ) ;
@@ -287,18 +290,19 @@ function setup(options, imports, register, app) {
287
290
logger . exception ( err , false ) ;
288
291
} ) . fin ( optimzeClientsAddons ) . then ( function ( ) {
289
292
return initNodeAddons ( )
290
- } ) . fail ( function ( err ) {
293
+ } ) . then ( function ( ) {
294
+ logger . log ( "Addons are ready" ) ;
295
+ register ( null , {
296
+ 'addons' : {
297
+ 'list' : loadAddonsInfos ,
298
+ 'install' : installAddon ,
299
+ 'uninstall' : uninstallAddon
300
+ }
301
+ } ) ;
302
+ } , function ( err ) {
291
303
logger . error ( "Error with external node addons:" ) ;
292
304
logger . exception ( err ) ;
293
305
} ) ;
294
-
295
- register ( null , {
296
- 'addons' : {
297
- 'list' : loadAddonsInfos ,
298
- 'install' : installAddon ,
299
- 'uninstall' : uninstallAddon
300
- }
301
- } ) ;
302
306
} ;
303
307
304
308
// Exports
0 commit comments