Skip to content

feat(wip): add debug template #39

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

Open
jorgevillaverde-sitewhere wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat(wip): add debug template #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5265fe
feat(wip): add debug template
jorgevillaverde-sitewhere Mar 22, 2021
31a7f22
feat: add debug template
jorgevillaverde-sitewhere Mar 22, 2021
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
4 changes: 3 additions & 1 deletion pkg/action/create_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ func (i *CreateInstance) Run() (*instance.CreateSiteWhereInstance, error) {
if i.ConfigurationTemplate == "" {
i.ConfigurationTemplate = defaultConfigurationTemplate
}
if i.Minimal {
if i.Debug {
prof = profile.Debug
} else if i.Minimal {
prof = profile.Minimal
i.ConfigurationTemplate = "minimal"
}
Expand Down
15 changes: 12 additions & 3 deletions pkg/action/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ package action
import (
"context"
"fmt"
"github.com/sitewhere/swctl/pkg/install/profile"
"io/ioutil"
"log"
"os"
Expand All @@ -28,6 +27,8 @@ import (
"sync"
"time"

"github.com/sitewhere/swctl/pkg/install/profile"

"gopkg.in/yaml.v2"

"github.com/gofrs/flock"
Expand Down Expand Up @@ -122,8 +123,13 @@ func (i *Install) Run() (*install.SiteWhereInstall, error) {

// ConfigurationExists check for swctl configuration file
func (i *Install) ConfigurationExists() bool {
_, err := config.LoadConfigurationTemplate(&config.PlaceHolder{}, profile.Default)
return err != config.ErrNotFound
for _, p := range profile.All {
_, err := config.LoadConfigurationTemplate(&config.PlaceHolder{}, p)
if err == config.ErrNotFound {
return false
}
}
return true
}

// CreateConfiguration Loads the default and minimal configuration
Expand All @@ -133,6 +139,9 @@ func (i *Install) CreateConfiguration() error {
if err = config.CreateMinimalConfiguration(); err != nil {
return err
}
if err = config.CreateDebugConfiguration(); err != nil {
return err
}
return config.CreateDefaultConfiguration()
}

Expand Down
Loading