summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2017-11-07 14:57:29 -0500
committerMatthew Heon <matthew.heon@gmail.com>2017-11-18 12:54:05 -0500
commitcb56716fc4bb632db84fab372fff8f5a9007ed3f (patch)
treecb387412db9b9233de3a8c7e9861ef8463c79030 /libpod
parentc6fe4430b76ceeecd6b0b609cca8e705921db0c4 (diff)
downloadpodman-cb56716fc4bb632db84fab372fff8f5a9007ed3f.tar.gz
podman-cb56716fc4bb632db84fab372fff8f5a9007ed3f.tar.bz2
podman-cb56716fc4bb632db84fab372fff8f5a9007ed3f.zip
Address review comments, fix gofmt and lint
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/container.go2
-rw-r--r--libpod/sql_state.go12
-rw-r--r--libpod/sql_state_internal.go4
3 files changed, 11 insertions, 7 deletions
diff --git a/libpod/container.go b/libpod/container.go
index bef3f1088..097455112 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -92,7 +92,7 @@ type containerConfig struct {
RootfsImageName string `json:"rootfsImageName,omitempty"`
UseImageConfig bool `json:"useImageConfig"`
// SELinux mount label for root filesystem
- MountLabel string `json:"MountLabel,omitempty"`
+ MountLabel string `json:"MountLabel,omitempty"`
// Static directory for container content that will persist across
// reboot
StaticDir string `json:"staticDir"`
diff --git a/libpod/sql_state.go b/libpod/sql_state.go
index 0564d124f..1218bfa79 100644
--- a/libpod/sql_state.go
+++ b/libpod/sql_state.go
@@ -7,12 +7,14 @@ import (
"os"
"github.com/containers/storage"
- _ "github.com/mattn/go-sqlite3"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
+
+ // Use SQLite backend for sql package
+ _ "github.com/mattn/go-sqlite3"
)
-// SqlState is a state implementation backed by a persistent SQLite3 database
+// SQLState is a state implementation backed by a persistent SQLite3 database
type SQLState struct {
db *sql.DB
specsDir string
@@ -22,7 +24,7 @@ type SQLState struct {
}
// NewSqlState initializes a SQL-backed state, created the database if necessary
-func NewSqlState(dbPath, lockPath, specsDir string, runtime *Runtime) (State, error) {
+func NewSQLState(dbPath, lockPath, specsDir string, runtime *Runtime) (State, error) {
state := new(SQLState)
state.runtime = runtime
@@ -85,8 +87,7 @@ func (s *SQLState) Close() error {
s.valid = false
- err := s.db.Close()
- if err != nil {
+ if err := s.db.Close(); err != nil {
return errors.Wrapf(err, "error closing database")
}
@@ -427,6 +428,7 @@ func (s *SQLState) RemovePod(pod *Pod) error {
return ErrNotImplemented
}
+// AllPods retrieves all pods presently in the state
func (s *SQLState) AllPods() ([]*Pod, error) {
return nil, ErrNotImplemented
}
diff --git a/libpod/sql_state_internal.go b/libpod/sql_state_internal.go
index 2597c4bb9..3f5f695bb 100644
--- a/libpod/sql_state_internal.go
+++ b/libpod/sql_state_internal.go
@@ -7,10 +7,12 @@ import (
"path/filepath"
"time"
- _ "github.com/mattn/go-sqlite3"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
+
+ // Use SQLite backend for sql package
+ _ "github.com/mattn/go-sqlite3"
)
// Performs database setup including by not limited to initializing tables in