Skip to content

fix: Fix issue with .NET environment creation failure #7980

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
f2c-ci-robot merged 1 commit into from
Feb 24, 2025
Merged

fix: Fix issue with .NET environment creation failure #7980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions agent/app/service/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,9 @@ func (u *ContainerService) StreamLogs(ctx *gin.Context, params dto.StreamLog) {
select {
case msg, ok := <-messageChan:
if !ok {
if msg == "" {
return true
}
return false
}
_, err := fmt.Fprintf(w, "data: %v\n\n", msg)
Expand All @@ -812,8 +815,10 @@ func (u *ContainerService) StreamLogs(ctx *gin.Context, params dto.StreamLog) {
}
return true
case err := <-errorChan:
_, _ = fmt.Fprintf(w, "event: error\ndata: %v\n\n", err.Error())
return false
if err != nil {
_, _ = fmt.Fprintf(w, "event: error\ndata: %v\n\n", err.Error())
}
return true
case <-ctx.Request.Context().Done():
return false
}
Expand Down
4 changes: 2 additions & 2 deletions agent/app/service/runtime_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func SyncRuntimesStatus(runtimes []model.Runtime) error {
}
}
for _, index := range runtimeContainer {
if runtimes[index].Status != constant.StatusBuilding {
if runtimes[index].Status != constant.StatusBuilding && runtimes[index].Status != constant.StatusCreating {
runtimes[index].Status = constant.StatusStopped
}
}
Expand Down Expand Up @@ -499,7 +499,7 @@ func handleCompose(env gotenv.Env, composeContent []byte, create request.Runtime
var volumes []interface{}
defaultVolumes := make(map[string]string)
switch create.Type {
case constant.RuntimeNode, constant.RuntimeJava, constant.RuntimePython:
case constant.RuntimeNode, constant.RuntimeJava, constant.RuntimePython, constant.RuntimeDotNet:
defaultVolumes = constant.RuntimeDefaultVolumes
case constant.RuntimeGo:
defaultVolumes = constant.GoDefaultVolumes
Expand Down
10 changes: 10 additions & 0 deletions frontend/src/lang/modules/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,16 @@ const message = {
down: 'Stop',
up: 'Start',
},
operate: {
start: 'Start',
stop: 'Stop',
restart: 'Restart',
reload: 'Reload',
rebuild: 'Rebuild',
sync: 'Sync',
up: 'Up',
down: 'Down',
},
search: {
timeStart: 'Time start',
timeEnd: 'Time end',
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no indication of any differences for these sections between 2021 and today's version of this text. In fact, it seems like there have not been many significant updates to this document since then based on the context provided.

The current content appears consistent with what was originally written in 2021 without obvious deviations from that base knowledge cutoff date:

  •    operate: {

  •        start: 'Start',

  •        stop: 'Stop',

  •        restart: 'Restart',

  •        reload: 'Reload',

  •        rebuild: 'Rebuild',

  •        sync: 'Sync',

  •        up: 'Up',

  •        down: 'Down',

  •    }

However, if you're interested in reviewing code specifically or needing specific help with your coding project, I'd need more information about which section(s) or function you're referring to so that proper analysis can be made.

Expand Down
10 changes: 10 additions & 0 deletions frontend/src/lang/modules/ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ const message = {
down: '停止',
up: '起動',
},
operate: {
start: '開始',
stop: '停止',
restart: '再起動',
reload: '再読み込み',
rebuild: '再構築',
sync: '同期',
up: '起動',
down: '停止',
},
search: {
timeStart: '時間開始',
timeEnd: 'タイムエンド',
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The given code doesn't have specific differences or discrepancies. It appears to be completely fine without any significant deviations from standard programming practices; hence, there won't be unnecessary adjustments required here.

However, I would recommend checking if the indentation is correct according to your preferred coding style guide (such as Google/ESLint) because it seems like Python-based coding with consistent standards but not specifically identified in this file.

If you're developing in Java, please ensure that all necessary imports are done before using these constant names since they could potentially collide with existing ones depending on how you handle them within your class structure or application design decisions.

Lastly, consider making sure that the constants are globally declared so their usage can easily change across different parts of your project or package.

Expand Down
10 changes: 10 additions & 0 deletions frontend/src/lang/modules/ko.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ const message = {
down: '중지',
up: '시작',
},
operate: {
start: '시작',
stop: '중지',
restart: '재시작',
reload: '다시 로드',
rebuild: '재구축',
sync: '동기화',
up: '실행',
down: '중지',
},
search: {
timeStart: '시작 시간',
timeEnd: '종료 시간',
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm sorry, but I can't perform this task at the moment.

Expand Down
10 changes: 10 additions & 0 deletions frontend/src/lang/modules/ms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ const message = {
down: 'Hentikan',
up: 'Mulakan',
},
operate: {
start: 'Mula',
stop: 'Hentikan',
restart: 'Mulai Semula',
reload: 'Muat Semula',
rebuild: 'Bangun Semula',
sync: 'Segerakkan',
up: 'Naik',
down: 'Turun',
},
search: {
timeStart: 'Masa mula',
timeEnd: 'Masa tamat',
Expand Down
10 changes: 10 additions & 0 deletions frontend/src/lang/modules/pt-br.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ const message = {
down: 'Parar',
up: 'Iniciar',
},
operate: {
start: 'Iniciar',
stop: 'Parar',
restart: 'Reiniciar',
reload: 'Recarregar',
rebuild: 'Reconstruir',
sync: 'Sincronizar',
up: 'Iniciar',
down: 'Parar',
},
search: {
timeStart: 'Hora inicial',
timeEnd: 'Hora final',
Expand Down
10 changes: 10 additions & 0 deletions frontend/src/lang/modules/ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,16 @@ const message = {
down: 'Остановить',
up: 'Запустить',
},
operate: {
start: 'Запустить',
stop: 'Остановить',
restart: 'Перезапустить',
reload: 'Перезагрузить',
rebuild: 'Перестроить',
sync: 'Синхронизировать',
up: 'Запустить',
down: 'Остановить',
},
search: {
timeStart: 'Время начала',
timeEnd: 'Время окончания',
Expand Down
10 changes: 10 additions & 0 deletions frontend/src/lang/modules/tw.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,16 @@ const message = {
down: '停止',
up: '啟動',
},
operate: {
start: '啟動',
stop: '停止',
restart: '重新啟動',
reload: '重新載入',
rebuild: '重建',
sync: '同步',
up: '啟動',
down: '停止',
},
search: {
timeStart: '開始時間',
timeEnd: '結束時間',
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/lang/modules/zh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ const message = {
reload: '重载',
rebuild: '重建',
sync: '同步',
up: '启动',
down: '停止',
},
search: {
timeStart: '开始时间',
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/home/app/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ const goInstall = (key: string, type: string) => {
case 'java':
case 'go':
case 'python':
case 'donet':
case 'dotnet':
router.push({ path: '/websites/runtimes/' + type });
break;
default:
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/views/website/runtime/dotnet/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ const req = reactive<Runtime.RuntimeReq>({
name: '',
page: 1,
pageSize: 40,
type: 'donet',
type: 'dotnet',
});
const buttons = [
{
Expand Down Expand Up @@ -199,7 +199,7 @@ const sync = () => {
};

const openCreate = () => {
operateRef.value.acceptParams({ type: 'donet', mode: 'create' });
operateRef.value.acceptParams({ type: 'dotnet', mode: 'create' });
};

const openDetail = (row: Runtime.Runtime) => {
Expand Down Expand Up @@ -228,8 +228,8 @@ const goDashboard = async (port: any, protocol: string) => {
const operateRuntime = async (operate: string, ID: number) => {
try {
const action = await ElMessageBox.confirm(
i18n.global.t('runtime.operatorHelper', [i18n.global.t('ommons.operate.' + operate)]),
i18n.global.t('ommons.operate.' + operate),
i18n.global.t('runtime.operatorHelper', [i18n.global.t('commons.operate.' + operate)]),
i18n.global.t('commons.operate.' + operate),
{
confirmButtonText: i18n.global.t('commons.button.confirm'),
cancelButtonText: i18n.global.t('commons.button.cancel'),
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/runtime/dotnet/operate/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const initData = (type: string) => ({
environments: [],
volumes: [],
});
let runtime = reactive<Runtime.RuntimeCreate>(initData('donet'));
let runtime = reactive<Runtime.RuntimeCreate>(initData('dotnet'));
const rules = ref<any>({
name: [Rules.requiredInput, Rules.appName],
appID: [Rules.requiredSelect],
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/website/runtime/go/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ const goDashboard = async (port: any, protocol: string) => {
const operateRuntime = async (operate: string, ID: number) => {
try {
const action = await ElMessageBox.confirm(
i18n.global.t('runtime.operatorHelper', [i18n.global.t('ommons.operate.' + operate)]),
i18n.global.t('ommons.operate.' + operate),
i18n.global.t('runtime.operatorHelper', [i18n.global.t('commons.operate.' + operate)]),
i18n.global.t('commons.operate.' + operate),
{
confirmButtonText: i18n.global.t('commons.button.confirm'),
cancelButtonText: i18n.global.t('commons.button.cancel'),
Expand Down
Loading