now logging allright
This commit is contained in:
		
							
								
								
									
										8
									
								
								dist/taskbuffer.classes.taskchain.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								dist/taskbuffer.classes.taskchain.js
									
									
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @@ -57,8 +57,7 @@ describe("taskbuffer",function(){ | ||||
|                 name:"task1", | ||||
|                 taskFunction:function(){ | ||||
|                     let done = plugins.q.defer(); | ||||
|                     console.log("Task1 run"); | ||||
|                     done.resolve(); | ||||
|                     setTimeout(done.resolve,2000); | ||||
|                     return done.promise; | ||||
|                 } | ||||
|             }), | ||||
| @@ -66,13 +65,13 @@ describe("taskbuffer",function(){ | ||||
|                 name:"task2", | ||||
|                 taskFunction: function(){ | ||||
|                     let done = plugins.q.defer(); | ||||
|                     console.log("Task2 run"); | ||||
|                     done.resolve(); | ||||
|                     setTimeout(done.resolve,2000); | ||||
|                     return done.promise; | ||||
|                 } | ||||
|             }), | ||||
|         ]; | ||||
|         it("should run tasks in sequence",function(done){ | ||||
|             this.timeout(5000); | ||||
|             testTaskchain = new taskbuffer.Taskchain({ | ||||
|                 name:"Taskchain1", | ||||
|                 taskArray:testTaskArray | ||||
|   | ||||
| @@ -5,7 +5,7 @@ import helpers = require("./taskbuffer.classes.helpers"); | ||||
|  | ||||
| export class Taskchain extends Task { | ||||
|     taskArray:Task[]; | ||||
|     private _oraObject; | ||||
|     private _oraObject:plugins.beautylog.Ora; | ||||
|     constructor(optionsArg:{ | ||||
|         name?:string, | ||||
|         log?:boolean, | ||||
| @@ -13,23 +13,25 @@ export class Taskchain extends Task { | ||||
|     }){ | ||||
|         let options = plugins.lodash.assign( | ||||
|             { | ||||
|                 name:"unnamed Task", | ||||
|                 name:"unnamed Taskchain", | ||||
|                 log:false | ||||
|             }, | ||||
|             optionsArg, | ||||
|             { | ||||
|                 taskFunction: () => { // this is the function that gets executed when TaskChain is triggered | ||||
|                     console.log("running taskchain function"); | ||||
|                     let done = plugins.Q.defer(); // this is the starting Deferred object  | ||||
|                     let taskCounter = 0; | ||||
|                     let iterateTasks = () => { | ||||
|                         if(typeof this.taskArray[taskCounter] != "undefined"){ | ||||
|                             this._oraObject.text(this.name + " running: Task" + this.taskArray[taskCounter].name); | ||||
|                             this.taskArray[taskCounter].trigger() | ||||
|                                 .then(()=>{ | ||||
|                                     this._oraObject.log(this.taskArray[taskCounter].name,"ok"); | ||||
|                                     taskCounter++; | ||||
|                                     iterateTasks(); | ||||
|                                 });      | ||||
|                         } else { | ||||
|                             this._oraObject.endOk("Taskchain \"" + this.name +  "\" completed successfully"); | ||||
|                             done.resolve(); | ||||
|                         } | ||||
|                     }; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user