deep-stack/laconic-console
3
0
Fork 0
forked from cerc-io/laconic-console
Code Pull Requests Activity

fix: load bf topic. (#60)

Browse Source
This commit is contained in:
Egor Gripasov 2020-12-16 12:13:17 +03:00 committed by GitHub
parent 2dd3022fa4
commit 3ae327a2d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/console-server/src/resolvers/bots.js
View File

@ -15,18 +15,19 @@ const SERVICE_CONFIG_FILENAME = 'service.yml';
const log = debug('dxos:console:server:resolvers'); const log = debug('dxos:console:server:resolvers');
let topic;
const getBotFactoryTopic = (botFactoryCwd) => { const getBotFactoryTopic = (botFactoryCwd) => {
// TODO(egorgripasov): Get topic from config or registry. if (!topic) {
const serviceFilePath = path.join(os.homedir(), botFactoryCwd || DEFAULT_BOT_FACTORY_CWD, SERVICE_CONFIG_FILENAME); // TODO(egorgripasov): Get topic from config or registry.
if (fs.existsSync(serviceFilePath)) { const serviceFilePath = path.join(os.homedir(), botFactoryCwd || DEFAULT_BOT_FACTORY_CWD, SERVICE_CONFIG_FILENAME);
const { topic } = yaml.safeLoad(fs.readFileSync(serviceFilePath)); if (fs.existsSync(serviceFilePath)) {
return topic; const botFactoryInfo = yaml.safeLoad(fs.readFileSync(serviceFilePath));
topic = botFactoryInfo.topic;
}
} }
return undefined; return topic;
}; };
const topic = getBotFactoryTopic();
const executeCommand = async (command, args, timeout = 10000) => { const executeCommand = async (command, args, timeout = 10000) => {
return new Promise((resolve) => { return new Promise((resolve) => {
const child = spawn(command, args, { encoding: 'utf8' }); const child = spawn(command, args, { encoding: 'utf8' });
@ -59,7 +60,7 @@ const executeCommand = async (command, args, timeout = 10000) => {
const getRunningBots = async () => { const getRunningBots = async () => {
const command = 'wire'; const command = 'wire';
const args = ['bot', 'factory', 'status', '--topic', topic]; const args = ['bot', 'factory', 'status', '--topic', getBotFactoryTopic()];
const { code, stdout, stderr } = await executeCommand(command, args); const { code, stdout, stderr } = await executeCommand(command, args);
return { return {
@ -71,7 +72,7 @@ const getRunningBots = async () => {
const sendBotCommand = async (botId, botCommand) => { const sendBotCommand = async (botId, botCommand) => {
const command = 'wire'; const command = 'wire';
const args = ['bot', botCommand, '--topic', topic, '--bot-id', botId]; const args = ['bot', botCommand, '--topic', getBotFactoryTopic(), '--bot-id', botId];
const { code, stdout, stderr } = await executeCommand(command, args); const { code, stdout, stderr } = await executeCommand(command, args);