5 files changed, 39 insertions, 5 deletions
diff --git a/libpod/events/config.go b/libpod/events/config.go
index d3b6d8c50..36387e835 100644
--- a/libpod/events/config.go
+++ b/libpod/events/config.go
@@ -84,6 +84,9 @@ const (
 	Image Type = "image"
 	// Pod - event is related to pods
 	Pod Type = "pod"
+	// System - event is related to Podman whole and not to any specific
+	// container/pod/image/volume
+	System Type = "system"
 	// Volume - event is related to volumes
 	Volume Type = "volume"
 
@@ -123,8 +126,14 @@ const (
 	Pull Status = "pull"
 	// Push ...
 	Push Status = "push"
+	// Refresh indicates that the system refreshed the state after a
+	// reboot.
+	Refresh Status = "refresh"
 	// Remove ...
 	Remove Status = "remove"
+	// Renumber indicates that lock numbers were reallocated at user
+	// request.
+	Renumber Status = "renumber"
 	// Restore ...
 	Restore Status = "restore"
 	// Save ...
diff --git a/libpod/events/events.go b/libpod/events/events.go
index e8c61faa0..202c9db4e 100644
--- a/libpod/events/events.go
+++ b/libpod/events/events.go
@@ -49,6 +49,8 @@ func (e *Event) ToHumanReadable() string {
 		humanFormat = fmt.Sprintf("%s %s %s %s (image=%s, name=%s)", e.Time, e.Type, e.Status, e.ID, e.Image, e.Name)
 	case Image:
 		humanFormat = fmt.Sprintf("%s %s %s %s %s", e.Time, e.Type, e.Status, e.ID, e.Name)
+	case System:
+		humanFormat = fmt.Sprintf("%s %s %s", e.Time, e.Type, e.Status)
 	case Volume:
 		humanFormat = fmt.Sprintf("%s %s %s %s", e.Time, e.Type, e.Status, e.Name)
 	}
@@ -85,10 +87,12 @@ func StringToType(name string) (Type, error) {
 		return Image, nil
 	case Pod.String():
 		return Pod, nil
+	case System.String():
+		return System, nil
 	case Volume.String():
 		return Volume, nil
 	}
-	return "", errors.Errorf("unknown event type %s", name)
+	return "", errors.Errorf("unknown event type %q", name)
 }
 
 // StringToStatus converts a string to an Event Status
@@ -107,7 +111,6 @@ func StringToStatus(name string) (Status, error) {
 	case Commit.String():
 		return Commit, nil
 	case Create.String():
-
 		return Create, nil
 	case Exec.String():
 		return Exec, nil
@@ -135,8 +138,14 @@ func StringToStatus(name string) (Status, error) {
 		return Pull, nil
 	case Push.String():
 		return Push, nil
+	case Refresh.String():
+		return Refresh, nil
 	case Remove.String():
 		return Remove, nil
+	case Renumber.String():
+		return Renumber, nil
+	case Restore.String():
+		return Restore, nil
 	case Save.String():
 		return Save, nil
 	case Start.String():
@@ -154,7 +163,7 @@ func StringToStatus(name string) (Status, error) {
 	case Untag.String():
 		return Untag, nil
 	}
-	return "", errors.Errorf("unknown event status %s", name)
+	return "", errors.Errorf("unknown event status %q", name)
 }
 
 func (e EventLogFile) getTail(options ReadOptions) (*tail.Tail, error) {
diff --git a/libpod/events/events_linux.go b/libpod/events/events_linux.go
index d6898145c..da5d7965e 100644
--- a/libpod/events/events_linux.go
+++ b/libpod/events/events_linux.go
@@ -1,13 +1,16 @@
 package events
 
 import (
-	"github.com/pkg/errors"
 	"strings"
+
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 // NewEventer creates an eventer based on the eventer type
 func NewEventer(options EventerOptions) (Eventer, error) {
 	var eventer Eventer
+	logrus.Debugf("Initializing event backend %s", options.EventerType)
 	switch strings.ToUpper(options.EventerType) {
 	case strings.ToUpper(Journald.String()):
 		eventer = EventJournalD{options}
diff --git a/libpod/events/journal_linux.go b/libpod/events/journal_linux.go
index e6b54db1d..8ba5bc2c7 100644
--- a/libpod/events/journal_linux.go
+++ b/libpod/events/journal_linux.go
@@ -7,6 +7,7 @@ import (
 	"github.com/coreos/go-systemd/journal"
 	"github.com/coreos/go-systemd/sdjournal"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 // EventJournalD is the journald implementation of an eventer
@@ -87,7 +88,11 @@ func (e EventJournalD) Read(options ReadOptions) error {
 		}
 		newEvent, err := newEventFromJournalEntry(entry)
 		if err != nil {
-			return err
+			// We can't decode this event.
+			// Don't fail hard - that would make events unusable.
+			// Instead, log and continue.
+			logrus.Errorf("Unable to decode event: %v", err)
+			continue
 		}
 		include := true
 		for _, filter := range eventOptions {
diff --git a/libpod/events/logfile.go b/libpod/events/logfile.go
index 3232b86d0..e5efc09bb 100644
--- a/libpod/events/logfile.go
+++ b/libpod/events/logfile.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/storage"
 	"github.com/pkg/errors"
 )
 
@@ -15,6 +16,13 @@ type EventLogFile struct {
 
 // Writes to the log file
 func (e EventLogFile) Write(ee Event) error {
+	// We need to lock events file
+	lock, err := storage.GetLockfile(e.options.LogFilePath + ".lock")
+	if err != nil {
+		return err
+	}
+	lock.Lock()
+	defer lock.Unlock()
 	f, err := os.OpenFile(e.options.LogFilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0700)
 	if err != nil {
 		return err