Signed-off-by: allencloud <allen.sun@daocloud.io>
allencloud authored on 2016/03/28 19:57:55... | ... |
@@ -33,7 +33,7 @@ var flatOptions = map[string]bool{ |
33 | 33 |
|
34 | 34 |
// LogConfig represents the default log configuration. |
35 | 35 |
// It includes json tags to deserialize configuration from a file |
36 |
-// using the same names that the flags in the command line uses. |
|
36 |
+// using the same names that the flags in the command line use. |
|
37 | 37 |
type LogConfig struct { |
38 | 38 |
Type string `json:"log-driver,omitempty"` |
39 | 39 |
Config map[string]string `json:"log-opts,omitempty"` |
... | ... |
@@ -41,17 +41,17 @@ type LogConfig struct { |
41 | 41 |
|
42 | 42 |
// CommonTLSOptions defines TLS configuration for the daemon server. |
43 | 43 |
// It includes json tags to deserialize configuration from a file |
44 |
-// using the same names that the flags in the command line uses. |
|
44 |
+// using the same names that the flags in the command line use. |
|
45 | 45 |
type CommonTLSOptions struct { |
46 | 46 |
CAFile string `json:"tlscacert,omitempty"` |
47 | 47 |
CertFile string `json:"tlscert,omitempty"` |
48 | 48 |
KeyFile string `json:"tlskey,omitempty"` |
49 | 49 |
} |
50 | 50 |
|
51 |
-// CommonConfig defines the configuration of a docker daemon which are |
|
51 |
+// CommonConfig defines the configuration of a docker daemon which is |
|
52 | 52 |
// common across platforms. |
53 | 53 |
// It includes json tags to deserialize configuration from a file |
54 |
-// using the same names that the flags in the command line uses. |
|
54 |
+// using the same names that the flags in the command line use. |
|
55 | 55 |
type CommonConfig struct { |
56 | 56 |
AuthorizationPlugins []string `json:"authorization-plugins,omitempty"` // AuthorizationPlugins holds list of authorization plugins |
57 | 57 |
AutoRestart bool `json:"-"` |
... | ... |
@@ -1591,8 +1591,9 @@ func (daemon *Daemon) initDiscovery(config *Config) error { |
1591 | 1591 |
|
1592 | 1592 |
// Reload reads configuration changes and modifies the |
1593 | 1593 |
// daemon according to those changes. |
1594 |
-// This are the settings that Reload changes: |
|
1594 |
+// These are the settings that Reload changes: |
|
1595 | 1595 |
// - Daemon labels. |
1596 |
+// - Daemon debug log level. |
|
1596 | 1597 |
// - Cluster discovery (reconfigure and restart). |
1597 | 1598 |
func (daemon *Daemon) Reload(config *Config) error { |
1598 | 1599 |
daemon.configStore.reloadLock.Lock() |
... | ... |
@@ -36,7 +36,7 @@ func (opts *ListOpts) String() string { |
36 | 36 |
return fmt.Sprintf("%v", []string((*opts.values))) |
37 | 37 |
} |
38 | 38 |
|
39 |
-// Set validates if needed the input value and add it to the |
|
39 |
+// Set validates if needed the input value and adds it to the |
|
40 | 40 |
// internal slice. |
41 | 41 |
func (opts *ListOpts) Set(value string) error { |
42 | 42 |
if opts.validator != nil { |