-
Notifications
You must be signed in to change notification settings - Fork 62
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.
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
feat: dev-sandbox 获取进程列表，获取进程状态 #1701
Open
SheepSheepChen
wants to merge
6
commits into
TencentBlueKing:builder-stack
Choose a base branch
from
SheepSheepChen:process_status
base: builder-stack
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+301
−36
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * TencentBlueKing is pleased to support the open source community by making | ||
| * 蓝鲸智云 - PaaS 平台 (BlueKing - PaaS System) available. | ||
| * Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * Licensed under the MIT License (the "License"); you may not use this file except | ||
| * in compliance with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://opensource.org/licenses/MIT | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under | ||
| * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
| * either express or implied. See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * We undertake not to change the open source license (MIT license) applicable | ||
| * to the current version of the project delivered to anyone in the future. | ||
| */ | ||
|
|
||
| package subcmd | ||
|
|
||
| import ( | ||
| "path/filepath" | ||
|
|
||
| "github.com/BurntSushi/toml" | ||
| "github.com/buildpacks/lifecycle/launch" | ||
| "github.com/spf13/cobra" | ||
|
|
||
| devlaunch "github.com/TencentBlueking/bkpaas/cnb-builder-shim/cmd/dev-launcher/launch" | ||
| "github.com/TencentBlueking/bkpaas/cnb-builder-shim/pkg/appdesc" | ||
| "github.com/TencentBlueking/bkpaas/cnb-builder-shim/pkg/logging" | ||
| "github.com/TencentBlueking/bkpaas/cnb-builder-shim/pkg/utils" | ||
| ) | ||
|
|
||
| var DefaultAppDir = utils.EnvOrDefault("CNB_APP_DIR", "/app") | ||
|
|
||
| var reloadCmd = &cobra.Command{ | ||
| Use: "reload", | ||
| Short: "reload processes.", | ||
| Long: "reload the given launch.Process list.", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| logger := logging.Default() | ||
|
|
||
| var md launch.Metadata | ||
|
|
||
| if _, err := toml.DecodeFile(launch.GetMetadataFilePath("/layers"), &md); err != nil { | ||
| logger.Error(err, "read metadata") | ||
| return err | ||
| } | ||
|
|
||
| appDesc, err := appdesc.UnmarshalToAppDesc(filepath.Join(DefaultAppDir, "app_desc.yaml")) | ||
| if err != nil { | ||
| logger.Error(err, "parse invalid app_desc.yaml") | ||
| return err | ||
| } | ||
|
|
||
| if err = devlaunch.Run(md.Processes, appDesc); err != nil { | ||
| logger.Error(err, "failed to hot launch") | ||
| return err | ||
| } | ||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| rootCmd.AddCommand(reloadCmd) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* | ||
| * TencentBlueKing is pleased to support the open source community by making | ||
| * 蓝鲸智云 - PaaS 平台 (BlueKing - PaaS System) available. | ||
| * Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * Licensed under the MIT License (the "License"); you may not use this file except | ||
| * in compliance with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://opensource.org/licenses/MIT | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under | ||
| * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
| * either express or implied. See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * We undertake not to change the open source license (MIT license) applicable | ||
| * to the current version of the project delivered to anyone in the future. | ||
| */ | ||
|
|
||
| package subcmd | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| var rootCmd = &cobra.Command{ | ||
| Use: "dev-launcher", | ||
| Short: "dev-launcher cli", | ||
| Long: `Manage processes defined by app_desc, including reload, getting status.`, | ||
| Run: func(cmd *cobra.Command, args []string) { | ||
| fmt.Println("dev-launcher manages processes defined by app_desc") | ||
| }, | ||
| } | ||
|
|
||
| func Execute() { | ||
| if err := rootCmd.Execute(); err != nil { | ||
| os.Exit(1) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| /* | ||
| * TencentBlueKing is pleased to support the open source community by making | ||
| * 蓝鲸智云 - PaaS 平台 (BlueKing - PaaS System) available. | ||
| * Copyright (C) 2017 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * Licensed under the MIT License (the "License"); you may not use this file except | ||
| * in compliance with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://opensource.org/licenses/MIT | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under | ||
| * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, | ||
| * either express or implied. See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * We undertake not to change the open source license (MIT license) applicable | ||
| * to the current version of the project delivered to anyone in the future. | ||
| */ | ||
|
|
||
| package subcmd | ||
|
|
||
| import ( | ||
| "github.com/spf13/cobra" | ||
|
|
||
| "github.com/TencentBlueking/bkpaas/cnb-builder-shim/cmd/dev-launcher/launch" | ||
| ) | ||
|
|
||
| var statusCmd = &cobra.Command{ | ||
| Use: "status", | ||
| Short: "process status.", | ||
| Long: "Get status of all processes.", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| return launch.NewSupervisorCtl().Status() | ||
| }, | ||
| } | ||
|
|
||
| func init() { | ||
| rootCmd.AddCommand(statusCmd) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这段提示怎么理解有误导，跑了还是没跑？
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
reload、status、stop 等操作应该是一个级别，一般 root 就是不放东西的
可以参考 bkpaas-cli ：
blueking-paas/bkpaas-cli/internal/cmd/root/root.go
Line 45 in d6e1aab
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
没跑的话，就不要用 run 这个词，确实容易有误导
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
已修改