blender/flamenco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: remove old commented-out config sections

Browse Source 
Various config sections were commented out, because they were brought in
from Flamenco 2 but weren't implemented yet. These have now been removed,
as the basic functionality is there, and new functionality will likely
be different from Flamenco 2 anyway.
This commit is contained in:
Sybren A. Stüvel 2022-07-05 17:23:31 +02:00
parent c187b9a9ad
commit 9f9a278634
1 changed files with 0 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
internal/manager/config/config.go
View File

@ -63,8 +63,6 @@ type ConfMeta struct {
} }
// Base contains those settings that are shared by all configuration versions. // Base contains those settings that are shared by all configuration versions.
// Various settings are commented out, because they were brought in from
// Flamenco 2 but not implemented yet.
type Base struct { type Base struct {
Meta ConfMeta `yaml:"_meta"` Meta ConfMeta `yaml:"_meta"`
@ -72,7 +70,6 @@ type Base struct {
DatabaseDSN string `yaml:"database"` DatabaseDSN string `yaml:"database"`
TaskLogsPath string `yaml:"task_logs_path"` TaskLogsPath string `yaml:"task_logs_path"`
Listen string `yaml:"listen"` Listen string `yaml:"listen"`
// ListenHTTPS string `yaml:"listen_https"`
SSDPDiscovery bool `yaml:"autodiscoverable"` SSDPDiscovery bool `yaml:"autodiscoverable"`
@ -80,17 +77,9 @@ type Base struct {
StoragePath string `yaml:"storage_path"` StoragePath string `yaml:"storage_path"`
Shaman shaman_config.Config `yaml:"shaman"` Shaman shaman_config.Config `yaml:"shaman"`
// TLS certificate management. TLSxxx has priority over ACME.
// TLSKey string `yaml:"tlskey"`
// TLSCert string `yaml:"tlscert"`
// ACMEDomainName string `yaml:"acme_domain_name"` // for the ACME Let's Encrypt client
TaskTimeout time.Duration `yaml:"task_timeout"` TaskTimeout time.Duration `yaml:"task_timeout"`
WorkerTimeout time.Duration `yaml:"worker_timeout"` WorkerTimeout time.Duration `yaml:"worker_timeout"`
// WorkerCleanupMaxAge time.Duration `yaml:"worker_cleanup_max_age"`
// WorkerCleanupStatus []string `yaml:"worker_cleanup_status"`
/* This many failures (on a given job+task type combination) will ban a worker /* This many failures (on a given job+task type combination) will ban a worker
* from that task type on that job. */ * from that task type on that job. */
BlocklistThreshold int `yaml:"blocklist_threshold"` BlocklistThreshold int `yaml:"blocklist_threshold"`
@ -98,17 +87,6 @@ type Base struct {
// When this many workers have tried the task and failed, it will be hard-failed // When this many workers have tried the task and failed, it will be hard-failed
// (even when there are workers left that could technically retry the task). // (even when there are workers left that could technically retry the task).
TaskFailAfterSoftFailCount int `yaml:"task_fail_after_softfail_count"` TaskFailAfterSoftFailCount int `yaml:"task_fail_after_softfail_count"`
// TestTasks TestTasks `yaml:"test_tasks"`
// Authentication settings.
// JWT jwtauth.Config `yaml:"user_authentication"`
// WorkerRegistrationSecret string `yaml:"worker_registration_secret"`
// Dynamic worker pools (Azure Batch, Google Compute, AWS, that sort).
// DynamicPoolPlatforms *dppoller.Config `yaml:"dynamic_pool_platforms,omitempty"`
// Websetup *WebsetupConf `yaml:"websetup,omitempty"`
} }
// GarbageCollect contains the config options for the GC. // GarbageCollect contains the config options for the GC.
@ -166,15 +144,6 @@ type VariableValue struct {
Value string `yaml:"value" json:"value"` Value string `yaml:"value" json:"value"`
} }
// WebsetupConf are settings used by the web setup mode.
// type WebsetupConf struct {
// // When true, the websetup will hide certain settings that are infrastructure-specific.
// // For example, it hides MongoDB choice, port numbers, task log directory, all kind of
// // hosting-specific things. This is used, for example, by the automated Azure deployment
// // to avoid messing up settings that are specific to that particular installation.
// HideInfraSettings bool `yaml:"hide_infra_settings"`
// }
// getConf parses flamenco-manager.yaml and returns its contents as a Conf object. // getConf parses flamenco-manager.yaml and returns its contents as a Conf object.
func getConf() (Conf, error) { func getConf() (Conf, error) {
return loadConf(configFilename) return loadConf(configFilename)
@ -239,10 +208,8 @@ func (c *Conf) processAfterLoading(override ...func(c *Conf)) {
c.addImplicitVariables() c.addImplicitVariables()
c.ensureVariablesUnique() c.ensureVariablesUnique()
c.constructVariableLookupTable() c.constructVariableLookupTable()
c.parseURLs()
c.checkDatabase() c.checkDatabase()
c.checkVariables() c.checkVariables()
c.checkTLS()
} }
func (c *Conf) processStorage() { func (c *Conf) processStorage() {
@ -537,50 +504,6 @@ func (c *Conf) Write(filename string) error {
return nil return nil
} }
// HasCustomTLS returns true if both the TLS certificate and key files are configured.
func (c *Conf) HasCustomTLS() bool {
// return c.TLSCert != "" && c.TLSKey != ""
return false
}
// HasTLS returns true if either a custom certificate or ACME/Let's Encrypt is used.
func (c *Conf) HasTLS() bool {
// return c.ACMEDomainName != "" || c.HasCustomTLS()
return false
}
func (c *Conf) checkTLS() {
// hasTLS := c.HasCustomTLS()
// if hasTLS && c.ListenHTTPS == "" {
// c.ListenHTTPS = c.Listen
// c.Listen = ""
// }
// if !hasTLS || c.ACMEDomainName == "" {
// return
// }
// log.Warn().
// Str("tlscert", c.TLSCert).
// Str("tlskey", c.TLSKey).
// Str("acme_domain_name", c.ACMEDomainName).
// Msg("ACME/Let's Encrypt will not be used because custom certificate is specified")
// c.ACMEDomainName = ""
}
func (c *Conf) parseURLs() {
// var err error
// if jwtURL, err := c.Flamenco.Parse(jwtPublicKeysRelativeURL); err != nil {
// log.WithFields(log.Fields{
// "url": c.Flamenco.String(),
// log.ErrorKey: err,
// }).Error("unable to construct URL to get JWT public keys")
// } else {
// c.JWT.PublicKeysURL = jwtURL.String()
// }
}
// GetTestConfig returns the configuration for unit tests. // GetTestConfig returns the configuration for unit tests.
// The config is loaded from `test-flamenco-manager.yaml` in the directory // The config is loaded from `test-flamenco-manager.yaml` in the directory
// containing the caller's source. // containing the caller's source.