Skip to content

fix: Fix issue with custom rules being lost after restarting OpenResty. #8929

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
Jun 5, 2025
Merged

fix: Fix issue with custom rules being lost after restarting OpenResty. #8929

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
6 changes: 0 additions & 6 deletions agent/app/service/app_install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,12 +264,6 @@ func (a *AppInstallService) Operate(req request.AppInstalledOperate) error {
}
return syncAppInstallStatus(&install, false)
case constant.Restart:
if install.App.Key == "openresty" {
websites, _ := websiteRepo.GetBy()
if len(websites) > 0 {
_ = createAllWebsitesWAFConfig(websites)
}
}
out, err := compose.Restart(dockerComposePath)
if err != nil {
return handleErr(install, err, out)
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Jun 5, 2025

Choose a reason for hiding this comment

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

There is an issue with this code related to the restart operation when install.App.Key equals "openresty". The function attempts to get all websites using websiteRepo.GetBy(), which assumes there's a method like that defined on the repository interface.

Here's what needs fixing:

Replace it with the actual implementation from your website repository. Assuming you need data from a specific table or query condition, modify it accordingly:

if install.App.Key == "openresty" {
  // Replace this line with the correct API call from your database
  websites, err := websiteRepo.GetOpenRestyRelatedWebsites()
  
  if err != nil || len(websites) == 0 {
    // Handle error appropriately (e.g., log or update installation status)
    return syncAppInstallStatus(&install, true) // Indicate failure to perform the desired task    
  }

  _ = createAllWebsitesWAFConfig(websites)
}

out, err := compose.Restart(dockerComposePath)

This ensures better correctness depending on how your website retrieval logic works and prevents runtime errors caused by missing or incorrect function calls.

Expand Down
8 changes: 4 additions & 4 deletions frontend/src/views/website/runtime/php/config/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
>
<template #content>
<el-tabs tab-position="left" v-model="index">
<el-tab-pane :label="$t('php.containerConfig')" name="6">
<Container :id="runtime.id" v-if="index == '6'"></Container>
</el-tab-pane>
<el-tab-pane :label="$t('website.updateConfig')" name="0">
<Config :id="runtime.id" v-if="index == '0'"></Config>
</el-tab-pane>
Expand All @@ -26,9 +29,6 @@
<el-tab-pane :label="'FPM ' + $t('website.source')" name="3">
<PHP :id="runtime.id" v-if="index == '3'" :type="'fpm'"></PHP>
</el-tab-pane>
<el-tab-pane :label="$t('php.containerConfig')" name="6">
<Container :id="runtime.id" v-if="index == '6'"></Container>
</el-tab-pane>
</el-tabs>
</template>
</DrawerPro>
Expand All @@ -44,7 +44,7 @@ import PHP from './php-fpm/index.vue';
import Performance from './performance/index.vue';
import Container from './container/index.vue';

const index = ref('0');
const index = ref('6');
const open = ref(false);
const runtime = ref({
name: '',
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Jun 5, 2025

Choose a reason for hiding this comment

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

There is an inconsistency in the ref values used between the two instances of <el-tabs> sections:

Before Change:

<el-tab-pane :label="$t('website.updateConfig')" name="0">

After Change:

<el-tab-pane :label="'FPM ' + $t('website.source')" name="3">

The name attributes "0" and "3" do not match the label text "$t('php.containerConfig')". This will cause the tabs to be labeled differently from their content.

Additionally, you might consider setting default values based on certain conditions (e.g., if user preferences or data dictate a specific tab should open by default).

Optimizations could involve reducing repetition within components like <PHP>, especially since they appear twice with different types. Also, ensure that Vue's reactive references (ref) are correctly set up across all related components to maintain state consistency.

Expand Down
Loading