GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(core.gbapp): Self-replication on Azure

Browse source
This commit is contained in:
Rodrigo Rodriguez 2019-05-27 12:16:30 -03:00
parent 8850370be4
commit 25091573a0
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/core.gbapp/services/GBCoreService.ts
View file

@ -221,6 +221,7 @@ export class GBCoreService implements IGBCoreService {
public async writeEnv(instance: IGBInstance) { public async writeEnv(instance: IGBInstance) {
const env = `ADDITIONAL_DEPLOY_PATH= const env = `ADDITIONAL_DEPLOY_PATH=
ADMIN_PASS=${instance.adminPass} ADMIN_PASS=${instance.adminPass}
BOT_ID=${instance.botId}
CLOUD_SUBSCRIPTIONID=${instance.cloudSubscriptionId} CLOUD_SUBSCRIPTIONID=${instance.cloudSubscriptionId}
CLOUD_LOCATION=${instance.cloudLocation} CLOUD_LOCATION=${instance.cloudLocation}
CLOUD_GROUP=${instance.botId} CLOUD_GROUP=${instance.botId}

4
packages/core.gbapp/services/GBImporterService.ts
View file

@ -40,6 +40,7 @@ import { IGBCoreService, IGBInstance } from 'botlib';
import fs = require('fs'); import fs = require('fs');
import urlJoin = require('url-join'); import urlJoin = require('url-join');
import { GuaribasInstance } from '../models/GBModel'; import { GuaribasInstance } from '../models/GBModel';
import { GBConfigService } from './GBConfigService';
/** /**
* Handles the importing of packages. * Handles the importing of packages.
@ -56,6 +57,9 @@ export class GBImporter {
if (botId === undefined) { if (botId === undefined) {
botId = packageJson.botId; botId = packageJson.botId;
} }
if (botId === undefined) {
botId = GBConfigService.get('BOT_ID');
}
const instance = await this.core.loadInstance(botId); const instance = await this.core.loadInstance(botId);
return await this.createOrUpdateInstanceInternal(instance, botId, localPath, packageJson); return await this.createOrUpdateInstanceInternal(instance, botId, localPath, packageJson);

2
packages/core.gbapp/services/GBMinService.ts
View file

@ -232,7 +232,7 @@ export class GBMinService {
*/ */
private async sendInstanceToClient(req, bootInstance: IGBInstance, res: any, webchatToken: any) { private async sendInstanceToClient(req, bootInstance: IGBInstance, res: any, webchatToken: any) {
let botId = req.params.botId; let botId = req.params.botId;
if (botId === '[default]') { if (botId === '[default]'|| botId === undefined) {
botId = GBConfigService.get('BOT_ID'); botId = GBConfigService.get('BOT_ID');
} }
const instance = await this.core.loadInstance(botId); const instance = await this.core.loadInstance(botId);