-
Notifications
You must be signed in to change notification settings - Fork 542
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: run manager-api as an OS agnostic service #1667
Merged
Merged
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
636009a
feat: manager api as systemd service
bisakhmondal ac71609
feat: cross-platform service support
bisakhmondal c2389a5
new manager-api commands
bisakhmondal 612d303
fix: misspell😅
bisakhmondal 27876cf
unit file cleaned up
bisakhmondal e169e36
new cli tests
bisakhmondal e21a9cf
suggestions from @tokers
bisakhmondal f4e71b7
Update cli_test.sh
juzhiyuan 3c81afd
Merge branch 'master' into issue#842
johzchen 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * 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. | ||
| */ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "os" | ||
| "runtime" | ||
|
|
||
| "github.com/apisix/manager-api/internal/conf" | ||
| "github.com/takama/daemon" | ||
| ) | ||
|
|
||
| type Service struct { | ||
| daemon.Daemon | ||
| } | ||
|
|
||
| var ServiceState struct { | ||
bisakhmondal marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| startService bool | ||
| stopService bool | ||
| installService bool | ||
| removeService bool | ||
| status bool | ||
| } | ||
|
|
||
| func createService() (*Service, error) { | ||
| var d daemon.Daemon | ||
| var err error | ||
| if runtime.GOOS == "darwin" { | ||
| d, err = daemon.New("apisix-dashboard", "Apache APISIX Dashboard", daemon.GlobalDaemon) | ||
| } else { | ||
| d, err = daemon.New("apisix-dashboard", "Apache APISIX Dashboard", daemon.SystemDaemon) | ||
| } | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| service := &Service{d} | ||
| return service, nil | ||
| } | ||
|
|
||
| func (service *Service) manageService() (string, error) { | ||
| if ServiceState.status { | ||
| return service.Status() | ||
| } | ||
| if ServiceState.removeService { | ||
| return service.Remove() | ||
| } | ||
| if conf.WorkDir == "." { | ||
| dir, err := os.Getwd() | ||
| if err != nil { | ||
| return "proceed with --work-dir flag", err | ||
| } | ||
| conf.WorkDir = dir | ||
| } | ||
| if ServiceState.installService { | ||
| return service.Install("-p", conf.WorkDir) | ||
| } | ||
| if ServiceState.startService { | ||
| iStatus, err := service.Install("-p", conf.WorkDir) | ||
| if err != nil { | ||
| if err != daemon.ErrAlreadyInstalled { | ||
| return iStatus, err | ||
| } | ||
| iStatus = "" | ||
| } | ||
| sStatus, err := service.Start() | ||
| if iStatus != "" { | ||
| sStatus = iStatus + "\n" + sStatus | ||
| } | ||
| return sStatus, err | ||
| } else if ServiceState.stopService { | ||
| return service.Stop() | ||
| } | ||
|
|
||
| err := manageAPI() | ||
| if err != nil { | ||
| return "Unable to start Manager API", err | ||
| } | ||
| return "The Manager API server exited", nil | ||
| } | ||
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.
I think we can quit after outputing this message.
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.
I avoided quitting because executing plain
./manager-apidoesn't require service struct ref. If somehowcreateServicereturns a nil service and service-specific commands are used go runtime manager will throw an error of referencing a nil struct before any line of actual logic of manager-api being executed (slightly ungraceful though). Let me know what you think.