Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita55ec72

Browse files
committed
update status
1 parent947f032 commita55ec72

File tree

7 files changed

+42
-13
lines changed

7 files changed

+42
-13
lines changed

‎deploy/playbook/group_vars/all/vars.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ postgres_directory: pg_data
88
pip_install_packages:
99
-name:docker
1010

11-
grucloud_image:"grucloud/grucloud-cli:v12.9.4"
11+
grucloud_image:"grucloud/grucloud-cli:v12.10.2"
1212
docker_base_url:"http:/v1.41"
1313
# Docker image tag names
1414
api_image:"fredericheem/grucloud-api"
15-
api_tag:"10.47"
15+
api_tag:"10.49"
1616

1717
web_image:"fredericheem/grucloud-ui"
18-
web_tag:"12.17"
18+
web_tag:"12.19"
1919

2020
firewall_state:started
2121
firewall_enabled_at_boot:true

‎deploy/playbook/group_vars/demo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ s3_bucket_upload: grucloud-console-demo
55

66
ws_url:"ws://172.31.30.158:9000"
77
ecs_cluster:"grucloud-console-dev"
8-
ecs_taskDefinition:"grucloud-cli:10"
8+
ecs_taskDefinition:"grucloud-cli:11"
99
ecs_subnet:"subnet-b80a4ff5"
1010
ecs_securityGroup:"sg-04e8312be2f0b22b4"

‎server/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
"db:drop":"dropdb dev -p 6432 -h localhost -U postgres",
2525
"db:recreate":"PGPASSWORD=password npm run db:drop && npm run db:create",
2626
"docker:build":"docker build . -t grucloud-api",
27-
"docker:tag":"docker tag grucloud-api fredericheem/grucloud-api:10.47",
28-
"docker:push":"docker push fredericheem/grucloud-api:10.47",
27+
"docker:tag":"docker tag grucloud-api fredericheem/grucloud-api:10.49",
28+
"docker:push":"docker push fredericheem/grucloud-api:10.49",
2929
"docker:btp":"npm run docker:build && npm run docker:tag && npm run docker:push",
3030
"docker:up":"docker-compose up -d",
3131
"docker:down":"docker-compose down",

‎server/src/plugins/cloudDiagram/api/runApi.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ exports.RunApi = ({ app, models }) => {
220220
]),
221221
]),
222222
}),
223+
assign({status:()=>"running"}),
223224
// Save the container_id to the db
224225
tap((data)=>{
225226
models.run.update({

‎server/src/plugins/cloudDiagram/index.js‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,11 @@ module.exports = (app) => {
106106
assert(ctx.request);
107107
console.log("ws message",message.toString());
108108
try{
109-
//TODO
110-
let{ command, action, options={}}=JSON.parse(message.toString());
111-
action&&(command=action);
109+
const{
110+
command,
111+
options={},
112+
data={},
113+
}=JSON.parse(message.toString());
112114
switch(command){
113115
case"join":
114116
console.log("join",options.room);
@@ -122,7 +124,33 @@ module.exports = (app) => {
122124
}
123125
producerMap.set(ws,options.room);
124126
break;
125-
case"list":
127+
case"list":{
128+
const{ error}=data;
129+
constroom=producerMap.get(ws);
130+
if(room){
131+
const[org_id,project_id,workspace_id,run_id]=
132+
room.split("/");
133+
console.log(
134+
"list",
135+
org_id,
136+
project_id,
137+
workspace_id,
138+
run_id,
139+
", error: ",
140+
error
141+
);
142+
models.run.update({
143+
where:{ org_id, project_id, workspace_id, run_id},
144+
data:{
145+
status:error ?"error" :"completed",
146+
updated_at:newDate().toUTCString(),
147+
},
148+
});
149+
}else{
150+
console.error("no room for list command");
151+
}
152+
}
153+
// fall through
126154
case"logs":
127155
constroom=producerMap.get(ws);
128156
if(room){

‎server/src/plugins/cloudDiagram/migrations/012.do.app-seed-js.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports.generateSql = () => {
44
VALUES (
55
'org-alice',
66
'project-alice',
7-
'workspace-project-alice-dev',
7+
'dev',
88
'Workspace dev alice',
99
'{
1010
"AWS_REGION": "${process.env.AWS_REGION}",
@@ -16,7 +16,7 @@ module.exports.generateSql = () => {
1616
VALUES (
1717
'org-alice',
1818
'project-alice',
19-
'workspace-project-alice-dev',
19+
'dev',
2020
'started',
2121
'list'
2222
);

‎server/src/plugins/cloudDiagram/test/test004Run.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const testMngr = require("test/testManager");
33
constAxios=require("axios");
44
constorg_id="org-alice";
55
constproject_id="project-alice";
6-
constworkspace_id="workspace-project-alice-dev";
6+
constworkspace_id="dev";
77

88
constpayloadCreateDocker={
99
reason:"my reason",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp