Skip to content

feat: prevent multiple apps #22

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
thewhitewizard merged 3 commits into from
Oct 22, 2025
Merged

feat: prevent multiple apps #22

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
040d4bc
feat: prevent multiple apps
thewhitewizard Oct 20, 2025
b35538a
refactor: best function name
thewhitewizard Oct 20, 2025
a91d157
refactor: change functions visibility
thewhitewizard Oct 20, 2025
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
18 changes: 11 additions & 7 deletions apploader/internal/cvm/cvm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ func NewCvmBootManager(config *config.CvmConfig) (CvmBootManager, error) {

// Start starts the cvm service
func (s *cvmBootManager) Start() {
s.startTask(s.cvmBootSequence.CvmAssistants)
s.startTask(s.cvmBootSequence.AppInfo)
s.processTasks(s.cvmBootSequence.CvmAssistants)
s.processTasks(s.cvmBootSequence.AppInfo)
}

// loadConfig loads the cvm app config
Expand All @@ -58,10 +58,14 @@ func (cbm *cvmBootManager) loadConfig() (*CvmBootSequence, error) {
if err != nil {
return nil, fmt.Errorf("unmarshal %s failed, error: %s", cbm.config.ConfigPath, err.Error())
}
// validate cvmBootSequence, we want no more than one app
if len(cvmBootSequence.AppInfo) >= 1 {
return nil, fmt.Errorf("only one application is supported, but got %d", len(cvmBootSequence.AppInfo))
}
return cvmBootSequence, nil
}

func (cbm *cvmBootManager) DoJob(taskInfo *TaskInfo) error {
func (cbm *cvmBootManager) executeTask(taskInfo *TaskInfo) error {
if taskInfo.Type != JOB {
return fmt.Errorf("this task is not a job")
}
Expand All @@ -87,7 +91,7 @@ func (cbm *cvmBootManager) DoJob(taskInfo *TaskInfo) error {

}

func (cbm *cvmBootManager) CreateSevers(taskInfo *TaskInfo) error {
func (cbm *cvmBootManager) deployService(taskInfo *TaskInfo) error {
if taskInfo.Type != SERVER {
return fmt.Errorf("task is not a server")
}
Expand Down Expand Up @@ -140,20 +144,20 @@ func (cbm *cvmBootManager) CreateSevers(taskInfo *TaskInfo) error {
return nil
}

func (cbm *cvmBootManager) startTask(tasks []*TaskInfo) {
func (cbm *cvmBootManager) processTasks(tasks []*TaskInfo) {
for i, t := range tasks {
switch t.Type {
case JOB:
log.Printf("begin to do job %s\n", t.Name)
err := cbm.DoJob(t)
err := cbm.executeTask(t)
if err != nil {
log.Fatalf("do job %s failed, error: %s\n", t.Name, err.Error())
}
log.Printf("end to do job %s\n", t.Name)
case SERVER:
log.Printf("begin to deploy server %s\n", t.Name)
t.Priority = i + 2
err := cbm.CreateSevers(t)
err := cbm.deployService(t)
if err != nil {
log.Fatalf("deploy server %s failed, error: %s\n", t.Name, err)
}
Expand Down