Skip to content

change restartInstance to restartService, possibly resolving cors errors on project creation. #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
foundling merged 2 commits into from
Nov 1, 2023
Merged

change restartInstance to restartService, possibly resolving cors errors on project creation. #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f92d21
Merge pull request #347 from HarperDB/stage
foundling Oct 31, 2023
66d63b4
change restartInstance to restartService, possibly resolving cors err…
Nov 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions src/components/instance/functions/manage/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import addComponent from '../../../../functions/api/instance/addComponent';
import packageComponent from '../../../../functions/api/instance/packageComponent';
import dropComponent from '../../../../functions/api/instance/dropComponent';
import deployComponent from '../../../../functions/api/instance/deployComponent';
import restartInstance from '../../../../functions/api/instance/restartInstance';
import restartService from '../../../../functions/api/instance/restartService';

import useInstanceAuth from '../../../../functions/state/instanceAuths';

Expand Down Expand Up @@ -85,7 +85,11 @@ function ManageIndex({ refreshCustomFunctions, loading }) {
setRestartingInstance(true);

setTimeout(async () => {
await restartInstance({ auth: instanceAuth, url: instanceUrl });
await restartService({
auth: instanceAuth,
url: instanceUrl,
service: 'http_workers'
});
setRestartingInstance(false);
}, 100);

Expand Down Expand Up @@ -211,7 +215,7 @@ function ManageIndex({ refreshCustomFunctions, loading }) {
return;
}

await restartInstance({ auth, url });
await restartService({ auth, url, service: 'http_workers' });
await refreshCustomFunctions();

}
Expand Down Expand Up @@ -269,7 +273,7 @@ function ManageIndex({ refreshCustomFunctions, loading }) {
alert.error(message);
}

await restartInstance({ auth, url });
await restartService({ auth, url, service: 'http_workers' });

await refreshCustomFunctions();

Expand Down Expand Up @@ -315,8 +319,12 @@ function ManageIndex({ refreshCustomFunctions, loading }) {
}

// TODO: what do we actually want to do about an invalid package?
// change to restartService({ auth, url, service: 'http_worker' });
await restartInstance({ auth: t.auth, url: t.instance.url });
// change to restartService({ auth, url, service: 'http_workers' });
await restartService({
auth: t.auth,
url: t.instance.url,
service: 'http_workers'
});

});

Expand All @@ -338,7 +346,7 @@ function ManageIndex({ refreshCustomFunctions, loading }) {
// TODO: what do we actually want to do about an invalid package?
// change to restartService({ auth, url, service: 'http_worker' });

await restartInstance({ auth: deployTarget.auth, url: deployTarget.instance.url });
await restartService({ auth: deployTarget.auth, url: deployTarget.instance.url, service: 'http_workers' });

}
*/
Expand Down Expand Up @@ -398,15 +406,17 @@ function ManageIndex({ refreshCustomFunctions, loading }) {
})

// restart targetInstance
await restartInstance({
await restartService({
auth: otherInstanceAuth,
url: otherInstance.url
url: otherInstance.url,
service: 'http_workers'
});

// restart this instance
await restartInstance({
await restartService({
auth,
url
url,
service: 'http_workers'
});

await refreshCustomFunctions();
Expand Down
1 change: 0 additions & 1 deletion src/components/shared/webide/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ function WebIDE({

}


}
} />
</Col>
Expand Down