Skip to content

Commit

Permalink
feature: update lock policy for container management
Browse files Browse the repository at this point in the history
Signed-off-by: Allen Sun <allensun.shl@alibaba-inc.com>
  • Loading branch information
allencloud committed May 14, 2018
1 parent 967f505 commit 536d62b
Show file tree
Hide file tree
Showing 8 changed files with 333 additions and 215 deletions.
2 changes: 1 addition & 1 deletion daemon/containerio/jsonfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func init() {

var jsonFilePathName = "json.log"

// TODO(fuwei): add compress/logrotate configurate
// TODO(fuwei): add compress/logrotate configuration
type jsonFile struct {
closed bool

Expand Down
2 changes: 1 addition & 1 deletion daemon/logger/jsonfile/jsonfile_read.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func (lf *JSONLogFile) ReadLogMessages(cfg *logger.ReadConfig) *logger.LogWatche

go func() {
// NOTE: We cannot close the channel in the JSONLogFile.read
// function because we cannot gurantee that watcher will be
// function because we cannot guarantee that watcher will be
// close the channel. Since the watcher is created in the
// JSONLogFile.ReadLogMessages, we make sure that watcher.Msgs
// can be closed after the JSONLogFile.read.
Expand Down
Loading

0 comments on commit 536d62b

Please sign in to comment.