docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-03 11:12:47 +03:00
Code Activity

Fixing live logs

Browse Source 
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
This commit is contained in:
Jeffrey Morgan
2015-04-30 13:27:55 -04:00
parent 4c2e2e95de
commit 3436076052
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/stores/ContainerStore.js
View File

@@ -5,7 +5,7 @@ var assign = require('object-assign');
var docker = require('../utils/DockerUtil');
var metrics = require('../utils/MetricsUtil');
var registry = require('../utils/RegistryUtil');
var logstore = require('../stores/LogStore');
var logStore = require('../stores/LogStore');
var bugsnag = require('bugsnag-js');
var _placeholders = {};
@@ -118,6 +118,7 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), {
return;
}
self.fetchContainer(name, callback);
logStore.fetch(name);
});
},
_createContainer: function (name, containerData, callback) {
@@ -363,9 +364,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), {
if (!data.name) {
data.name = data.Name;
}
if (name !== data.name) {
logstore.rename(name, data.name);
}
var fullData = assign(_containers[name], data);
this._createContainer(name, fullData, function () {
_muted[name] = false;
@@ -374,7 +372,6 @@ var ContainerStore = assign(Object.create(EventEmitter.prototype), {
}.bind(this));
},
rename: function (name, newName, callback) {
logstore.rename(name, newName);
docker.client().getContainer(name).rename({name: newName}, err => {
if (err && err.statusCode !== 204) {
callback(err);

4
src/stores/LogStore.js
View File

@@ -68,11 +68,15 @@ module.exports = assign(Object.create(EventEmitter.prototype), {
}
this.emit(this.SERVER_LOGS_EVENT);
});
logStream.on('end', () => {
this.detach(name);
});
});
},
detach: function (name) {
if (_streams[name]) {
_streams[name].destroy();
delete _streams[name];
}
},
logs: function (name) {