Merge branch 'duplicate-logs' of https://github.com/gliderlabs/logspout…

… into duplicate-logs

Dockerfile

@@ -6,5 +6,6 @@ EXPOSE 80
 COPY . /src
 RUN cd /src && ./build.sh "$(cat VERSION)"
 
+ONBUILD COPY ./build.sh /src/build.sh
 ONBUILD COPY ./modules.go /src/modules.go
 ONBUILD RUN cd /src && ./build.sh "$(cat VERSION)-custom"

Dockerfile.custom

@@ -0,0 +1,6 @@
+FROM iron/go:dev
+
+WORKDIR /app
+ADD . /app
+
+ENTRYPOINT ["./logspout"]

MODULES.md

@@ -0,0 +1,26 @@
+Instructions on how to build/test your own modules. 
+
+## Getting Started
+
+1. Fork this repository
+1. Create a new repository for your adapter
+1. Copy something like [raw.go](https://github.com/gliderlabs/logspout/blob/master/adapters/raw/raw.go) to get started.
+1. Add your module to modules.go
+
+Now build and run logspout with your adapter, replace SYSLOG with your own syslog url. 
+
+```sh
+SYSLOG=syslog://logs.papertrailapp.com:55555 ./run-custom.sh
+```
+
+Now let's add your new adapter to the running logspout (replace address below with your final stats destination):
+
+```sh
+curl http://localhost:8000/routes -d '{
+  "adapter": "myadapter",
+  "filter_sources": ["stdout" ,"stderr"],
+  "address": "localhost:1234"
+}'
+```
+
+Now any log messages that come out of any container on your machine will go through your adapter. 

README.md

@@ -33,15 +33,23 @@ The simplest way to use logspout is to just take all logs and ship to a remote s
 		gliderlabs/logspout \
 		syslog://logs.papertrailapp.com:55555
 
-logspout will gather logs from other containers that are started **without the `-t` option**.
+logspout will gather logs from other containers that are started **without the `-t` option** and are configured with a logging driver that works with `docker logs` (`journald` and `json-file`).
 
 To see what data is used for syslog messages, see the [syslog adapter](http://github.com/gliderlabs/logspout/blob/master/adapters) docs.
 
 #### Ignoring specific containers
 
 You can tell logspout to ignore specific containers by setting an environment variable when starting your container, like so:-
 
-        $ docker run -d -e 'LOGSPOUT=ignore' image
+    $ docker run -d -e 'LOGSPOUT=ignore' image
+
+Or, by adding a label which you define by setting an environment variable when running logspout:
+
+    $ docker run --name="logspout" \
+        -e EXCLUDE_LABEL=logspout.exclude \
+        --volume=/var/run/docker.sock:/var/run/docker.sock \
+        gliderlabs/logspout
+    $ docker run -d --label logspout.exclude=true image
 
 #### Inspect log streams using curl
 

build-custom.sh

@@ -0,0 +1,6 @@
+set -ex
+
+docker run --rm -v "$GOPATH":/go -w /go/src/github.com/gliderlabs/logspout -e "GOPATH=/go" iron/go:dev sh -c 'go build -o logspout'
+
+# Can build the image too
+# docker build -t gliderlabs/logspout:latest .

router/pump.go

@@ -53,13 +53,26 @@ func normalID(id string) string {
 	return id
 }
 
+func logDriverSupported(container *docker.Container) bool {
+	switch container.HostConfig.LogConfig.Type {
+	case "json-file", "journald":
+		return true
+	default:
+		return false
+	}
+}
+
 func ignoreContainer(container *docker.Container) bool {
 	for _, kv := range container.Config.Env {
 		kvp := strings.SplitN(kv, "=", 2)
 		if len(kvp) == 2 && kvp[0] == "LOGSPOUT" && strings.ToLower(kvp[1]) == "ignore" {
 			return true
 		}
 	}
+	excludeLabel := getopt("EXCLUDE_LABEL", "")
+	if value, ok := container.Config.Labels[excludeLabel]; ok {
+		return len(excludeLabel) > 0 && strings.ToLower(value) == "true"
+	}
 	return false
 }
 
@@ -143,11 +156,9 @@ func (p *LogsPump) pumpLogs(event *docker.APIEvents) {
 
 	outrd, outwr := io.Pipe()
 	errrd, errwr := io.Pipe()
-	p.mu.Lock()
 	p.pumps[id] = newContainerPump(container, outrd, errrd)
 	p.mu.Unlock()
 	p.update(event)
-	debug("pump.pumpLogs():", id, "started")
 	go func() {
 		err := p.client.Logs(docker.LogsOptions{
 			Container:    id,
@@ -162,11 +173,6 @@ func (p *LogsPump) pumpLogs(event *docker.APIEvents) {
 		if err != nil {
 			debug("pump.pumpLogs():", id, "stopped:", err)
 		}
-		outwr.Close()
-		errwr.Close()
-		p.mu.Lock()
-		delete(p.pumps, id)
-		p.mu.Unlock()
 	}()
 }
 

run-custom.sh

@@ -0,0 +1,9 @@
+set -ex
+
+./build-custom.sh
+docker build --file Dockerfile.custom -t mylogspouter .
+docker run --rm --name=logspout \
+    -v=/var/run/docker.sock:/var/run/docker.sock \
+    -p 8000:80 \
+    mylogspouter \
+    ${SYSLOG}