diff --git a/OpenFlow/src/DBHelper.ts b/OpenFlow/src/DBHelper.ts index b76ad3f7..9a8d690e 100644 --- a/OpenFlow/src/DBHelper.ts +++ b/OpenFlow/src/DBHelper.ts @@ -769,7 +769,10 @@ export class DBHelper { } private async AgentUpdate(_id: string, slug: string, watch: boolean, span: Span) { Logger.instanse.debug("Clear queue cache : " + slug + " " + _id, span); - if (!NoderedUtil.IsNullEmpty(slug)) await this.DeleteKey(("agent_" + slug).toString(), watch, false, span); + if (!NoderedUtil.IsNullEmpty(slug)) { + await this.DeleteKey(("agent_" + slug).toString(), watch, false, span); + await this.DeleteKey(("agent_" + slug + "agent").toString(), watch, false, span); + } if (!NoderedUtil.IsNullEmpty(_id)) await this.DeleteKey(("agent_" + _id).toString(), watch, false, span); } private async QueueUpdate(_id: string, name: string, watch: boolean, span: Span) { diff --git a/OpenFlow/src/WebServer.ts b/OpenFlow/src/WebServer.ts index 8d1f0780..3f333a29 100644 --- a/OpenFlow/src/WebServer.ts +++ b/OpenFlow/src/WebServer.ts @@ -453,10 +453,10 @@ export class WebServer { id: result._id.toString()})).finish()}) } else { - throw new Error("Access denied") + throw new Error("Access denied, downloading " + msg.id) } } else { - throw new Error("Access denied") + throw new Error("Access denied (No id)") // var filename = msg.filename; // await protowrap.sendFileContent(client, reply.rid, filename, SendFileHighWaterMark); // msg.filename = path.basename(filename); diff --git a/OpenFlow/src/dockerdriver.ts b/OpenFlow/src/dockerdriver.ts index 4cf89f1f..5a6ada14 100644 --- a/OpenFlow/src/dockerdriver.ts +++ b/OpenFlow/src/dockerdriver.ts @@ -169,7 +169,6 @@ export class dockerdriver implements i_agent_driver { const Env = [ "jwt=" + agentjwt, "agentid=" + agent._id, - "packageid=" + agent.package, "apiurl=" + apiurl, "grpcapiurl=" + grpcapiurl, "wsapiurl=" + wsapiurl, @@ -193,6 +192,10 @@ export class dockerdriver implements i_agent_driver { "oidc_authorization_endpoint=" + Config.agent_oidc_authorization_endpoint, "oidc_token_endpoint=" + Config.agent_oidc_token_endpoint, ] + let packageid = agent.package || ""; + if(packageid != "") { + Env.push("packageid=" + packageid); + } if(agent.environment != null) { var keys = Object.keys(agent.environment); for(var i = 0; i < keys.length; i++) { diff --git a/OpenFlow/src/public/Controllers.ts b/OpenFlow/src/public/Controllers.ts index 5ac4d833..53b11f46 100644 --- a/OpenFlow/src/public/Controllers.ts +++ b/OpenFlow/src/public/Controllers.ts @@ -8002,10 +8002,10 @@ export class AgentCtrl extends entityCtrl { console.log("filtered again", this.packages) } if (this.model._id == null || this.model._id == "") { - this.model.package = ""; - if ((this.model.package == null || this.model.package == "") && this.packages.length > 0) { - this.model.package = this.packages[0]._id; - } + // this.model.package = ""; + // if ((this.model.package == null || this.model.package == "") && this.packages.length > 0) { + // this.model.package = this.packages[0]._id; + // } } this.packages.unshift({ _id: "", name: "None" }) } @@ -8663,12 +8663,12 @@ export class RunPackageCtrl extends entityCtrl { this.packages = this.packages.filter(x => x.chrome != true && x.chromium != true) console.log("filtered again", this.packages) } - if(this.packages.find(x => x._id == this.package) == null) { - this.package = ""; - } - if(this.package == "" && this.packages.length > 0) { - this.package = this.packages[0]._id; - } + // if(this.packages.find(x => x._id == this.package) == null) { + // this.package = ""; + // } + // if(this.package == "" && this.packages.length > 0) { + // this.package = this.packages[0]._id; + // } if (!this.$scope.$$phase) { this.$scope.$apply(); } } async addprocess(streamid:string, schedulename:string = undefined): Promise {