rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pkg/logging: Remove unneeded argument

Browse source
This commit is contained in:
Tom Wiesing 2023-03-13 13:24:19 +01:00
parent d7847b5d69
commit 2493cbb078
No known key found for this signature in database
15 changed files with 75 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/backup.go
View file

@ -42,7 +42,7 @@ func (bk backup) Run(context wisski_distillery.Context) error {
if !bk.NoPrune {
defer logging.LogOperation(func() error {
return dis.Exporter().PruneExports(context.Context, context.Stderr)
}, context.Stderr, context.Context, "Pruning old backups")
}, context.Stderr, "Pruning old backups")
}
// do the handling

12
cmd/bootstrap.go
View file

@ -80,7 +80,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
}
{
logging.LogMessage(context.Stderr, context.Context, "Creating root deployment directory")
logging.LogMessage(context.Stderr, "Creating root deployment directory")
if err := fsx.MkdirAll(root, fsx.DefaultDirPerm); err != nil {
return errBootstrapFailedToCreateDirectory.WithMessageF(root).Wrap(err)
}
@ -105,7 +105,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
}
{
logging.LogMessage(context.Stderr, context.Context, "Copying over wdcli executable")
logging.LogMessage(context.Stderr, "Copying over wdcli executable")
exe, err := os.Executable()
if err != nil {
return errBoostrapFailedToCopyExe.WithMessageF(err)
@ -144,7 +144,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
}
return nil
}, context.Stderr, context.Context, "Creating custom config files"); err != nil {
}, context.Stderr, "Creating custom config files"); err != nil {
return errBootstrapCreateFile.Wrap(err)
}
@ -170,7 +170,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
_, err := configYML.Write(bytes)
return err
}
}, context.Stderr, context.Context, "Installing primary configuration file"); err != nil {
}, context.Stderr, "Installing primary configuration file"); err != nil {
return errBootstrapWriteConfig.Wrap(err)
}
}
@ -178,7 +178,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
}
// re-read the configuration and print it!
logging.LogMessage(context.Stderr, context.Context, "Configuration is now complete")
logging.LogMessage(context.Stderr, "Configuration is now complete")
f, err := os.Open(cfgPath)
if err != nil {
return errBootstrapOpenConfig.Wrap(err)
@ -192,7 +192,7 @@ func (bs cBootstrap) Run(context wisski_distillery.Context) error {
context.Println(cfg)
// Tell the user how to proceed
logging.LogMessage(context.Stderr, context.Context, "Bootstrap is complete")
logging.LogMessage(context.Stderr, "Bootstrap is complete")
context.Printf("Adjust the configuration file at %s\n", cfgPath)
context.Printf("Then make sure 'docker compose' is installed.\n")
context.Printf("Finally grab a GraphDB zipped source file and run:\n")

12
cmd/monday.go
View file

@ -37,36 +37,36 @@ func (monday monday) AfterParse() error {
func (monday monday) Run(context wisski_distillery.Context) error {
if err := logging.LogOperation(func() error {
return context.Exec("backup")
}, context.Stderr, context.Context, "Running backup"); err != nil {
}, context.Stderr, "Running backup"); err != nil {
return err
}
if err := logging.LogOperation(func() error {
return context.Exec("system_update", monday.Positionals.GraphdbZip)
}, context.Stderr, context.Context, "Running system_update"); err != nil {
}, context.Stderr, "Running system_update"); err != nil {
return err
}
if err := logging.LogOperation(func() error {
return context.Exec("rebuild")
}, context.Stderr, context.Context, "Running rebuild"); err != nil {
}, context.Stderr, "Running rebuild"); err != nil {
return err
}
if err := logging.LogOperation(func() error {
return context.Exec("update_prefix_config")
}, context.Stderr, context.Context, "Running update_prefix_config"); err != nil {
}, context.Stderr, "Running update_prefix_config"); err != nil {
return err
}
if monday.UpdateInstances {
if err := logging.LogOperation(func() error {
return context.Exec("blind_update")
}, context.Stderr, context.Context, "Running blind_update"); err != nil {
}, context.Stderr, "Running blind_update"); err != nil {
return err
}
}
logging.LogMessage(context.Stderr, context.Context, "Done, have a great week!")
logging.LogMessage(context.Stderr, "Done, have a great week!")
return nil
}

2
cmd/provision.go
View file

@ -43,7 +43,7 @@ func (p pv) Run(context wisski_distillery.Context) error {
}
// and we're done!
logging.LogMessage(context.Stderr, context.Context, "Instance has been provisioned")
logging.LogMessage(context.Stderr, "Instance has been provisioned")
context.Printf("URL: %s\n", instance.URL().String())
context.Printf("Username: %s\n", instance.DrupalUsername)
context.Printf("Password: %s\n", instance.DrupalPassword)

10
cmd/reserve.go
View file

@ -47,7 +47,7 @@ func (r reserve) Run(context wisski_distillery.Context) (err error) {
slug := r.Positionals.Slug
// check that it doesn't already exist
logging.LogMessage(context.Stderr, context.Context, "Reserving new WissKI instance %s", slug)
logging.LogMessage(context.Stderr, "Reserving new WissKI instance %s", slug)
if exists, err := dis.Instances().Has(context.Context, slug); err != nil || exists {
return errReserveAlreadyExists.WithMessageF(slug)
}
@ -59,7 +59,7 @@ func (r reserve) Run(context wisski_distillery.Context) (err error) {
}
// check that the base directory does not exist
logging.LogMessage(context.Stderr, context.Context, "Checking that base directory %s does not exist", instance.FilesystemBase)
logging.LogMessage(context.Stderr, "Checking that base directory %s does not exist", instance.FilesystemBase)
if fsx.IsDirectory(instance.FilesystemBase) {
return errReserveAlreadyExists.WithMessageF(slug)
}
@ -69,19 +69,19 @@ func (r reserve) Run(context wisski_distillery.Context) (err error) {
{
if err := logging.LogOperation(func() error {
return s.Install(context.Context, context.Stderr, component.InstallationContext{})
}, context.Stderr, context.Context, "Installing docker stack"); err != nil {
}, context.Stderr, "Installing docker stack"); err != nil {
return err
}
if err := logging.LogOperation(func() error {
return s.Update(context.Context, context.Stderr, true)
}, context.Stderr, context.Context, "Updating docker stack"); err != nil {
}, context.Stderr, "Updating docker stack"); err != nil {
return err
}
}
// and we're done!
logging.LogMessage(context.Stderr, context.Context, "Instance has been reserved")
logging.LogMessage(context.Stderr, "Instance has been reserved")
context.Printf("URL: %s\n", instance.URL().String())
return nil

8
cmd/system_pause.go
View file

@ -60,7 +60,7 @@ func (sp systempause) Run(context wisski_distillery.Context) (err error) {
}
func (sp systempause) start(context wisski_distillery.Context, dis *dis.Distillery) error {
logging.LogMessage(context.Stderr, context.Context, "Starting Components")
logging.LogMessage(context.Stderr, "Starting Components")
// find all the core stacks
if err := status.RunErrorGroup(context.Stderr, status.Group[component.Installable, error]{
@ -76,7 +76,7 @@ func (sp systempause) start(context wisski_distillery.Context, dis *dis.Distille
return err
}
logging.LogMessage(context.Stderr, context.Context, "Starting Up WissKIs")
logging.LogMessage(context.Stderr, "Starting Up WissKIs")
// find the instances
wissKIs, err := dis.Instances().All(context.Context)
@ -102,7 +102,7 @@ func (sp systempause) start(context wisski_distillery.Context, dis *dis.Distille
}
func (sp systempause) stop(context wisski_distillery.Context, dis *dis.Distillery) error {
logging.LogMessage(context.Stderr, context.Context, "Shutting Down WissKIs")
logging.LogMessage(context.Stderr, "Shutting Down WissKIs")
// find the instances
wissKIs, err := dis.Instances().All(context.Context)
@ -124,7 +124,7 @@ func (sp systempause) stop(context wisski_distillery.Context, dis *dis.Distiller
return err
}
logging.LogMessage(context.Stderr, context.Context, "Shutting Down Components")
logging.LogMessage(context.Stderr, "Shutting Down Components")
// find all the core stacks
if err := status.RunErrorGroup(context.Stderr, status.Group[component.Installable, error]{

20
cmd/system_update.go
View file

@ -83,7 +83,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
dis := context.Environment
// create all the other directories
logging.LogMessage(context.Stderr, context.Context, "Ensuring distillery installation directories exist")
logging.LogMessage(context.Stderr, "Ensuring distillery installation directories exist")
for _, d := range []string{
dis.Config.Paths.Root,
dis.Instances().Path(),
@ -99,7 +99,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
if si.InstallDocker {
// install system updates
logging.LogMessage(context.Stderr, context.Context, "Updating Operating System Packages")
logging.LogMessage(context.Stderr, "Updating Operating System Packages")
if err := si.mustExec(context, "", "apt-get", "update"); err != nil {
return err
}
@ -108,7 +108,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
}
// install docker
logging.LogMessage(context.Stderr, context.Context, "Installing / Updating Docker")
logging.LogMessage(context.Stderr, "Installing / Updating Docker")
if err := si.mustExec(context, "", "apt-get", "install", "curl"); err != nil {
return err
}
@ -120,7 +120,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
// check that the docker api is available
{
logging.LogMessage(context.Stderr, context.Context, "Checking that the 'docker' api is reachable")
logging.LogMessage(context.Stderr, "Checking that the 'docker' api is reachable")
ping, err := dis.Docker().Ping(context.Context)
if err != nil {
return errDockerUnreachable.Wrap(err)
@ -129,7 +129,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
}
{
logging.LogMessage(context.Stderr, context.Context, "Checking that 'docker compose' is available")
logging.LogMessage(context.Stderr, "Checking that 'docker compose' is available")
if err := si.mustExec(context, "", "docker", "compose", "version"); err != nil {
return err
}
@ -137,7 +137,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
// create the docker networks
{
logging.LogMessage(context.Stderr, context.Context, "Configuring docker networks")
logging.LogMessage(context.Stderr, "Configuring docker networks")
for _, name := range dis.Config.Docker.Networks() {
id, existed, err := dis.Docker().CreateNetwork(context.Context, name)
@ -192,7 +192,7 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
return ud.Update(context.Context, writer)
},
}, dis.Installable())
}, context.Stderr, context.Context, "Performing Stack Updates"); err != nil {
}, context.Stderr, "Performing Stack Updates"); err != nil {
return err
}
@ -206,17 +206,17 @@ func (si systemupdate) Run(context wisski_distillery.Context) (err error) {
return nil
}
return item.Update(context.Context, context.Stderr)
}, context.Stderr, context.Context, "Updating Component: %s", name); err != nil {
}, context.Stderr, "Updating Component: %s", name); err != nil {
return errBootstrapComponent.WithMessageF(name).Wrap(err)
}
}
return nil
}, context.Stderr, context.Context, "Performing Component Updates"); err != nil {
}, context.Stderr, "Performing Component Updates"); err != nil {
return err
}
// TODO: Register cronjob in /etc/cron.d!
logging.LogMessage(context.Stderr, context.Context, "System has been updated")
logging.LogMessage(context.Stderr, "System has been updated")
return nil
}