From 135ddd8f0195f563a2eccb4a384f5d004d1a1f4c Mon Sep 17 00:00:00 2001
From: Nan Deng <dengnan@google.com>
Date: Tue, 8 Jul 2014 18:15:36 -0700
Subject: [PATCH] s/db/storage_driver/

---
 cadvisor.go      |  7 ++-----
 storagedriver.go | 14 ++++++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/cadvisor.go b/cadvisor.go
index 68f994b5..045a0d81 100644
--- a/cadvisor.go
+++ b/cadvisor.go
@@ -30,21 +30,18 @@ import (
 )
 
 var argPort = flag.Int("port", 8080, "port to listen")
-var argSampleSize = flag.Int("samples", 1024, "number of samples we want to keep")
-var argHistoryDuration = flag.Int("history_duration", 60, "number of seconds of container history to keep")
 var argAllowLmctfy = flag.Bool("allow_lmctfy", true, "whether to allow lmctfy as a container handler")
 
-var argDbDriver = flag.String("db", "memory", "database driver name")
+var argDbDriver = flag.String("storage_driver", "memory", "database driver name")
 
 func main() {
 	flag.Parse()
 
-	storageDriver, err := NewStorage(*argDbDriver)
+	storageDriver, err := NewStorageDriver(*argDbDriver)
 	if err != nil {
 		log.Fatalf("Failed to connect to database: %s", err)
 	}
 
-	// TODO(monnand): Add stats writer for manager
 	containerManager, err := manager.New(storageDriver)
 	if err != nil {
 		log.Fatalf("Failed to create a Container Manager: %s", err)
diff --git a/storagedriver.go b/storagedriver.go
index 8a75e61d..6ee7715b 100644
--- a/storagedriver.go
+++ b/storagedriver.go
@@ -25,13 +25,15 @@ import (
 	"github.com/google/cadvisor/storage/memory"
 )
 
-var argDbUsername = flag.String("db.user", "root", "database username")
-var argDbPassword = flag.String("db.password", "root", "database password")
-var argDbHost = flag.String("db.host", "localhost:8086", "database host:port")
-var argDbName = flag.String("db.name", "cadvisor", "database name")
-var argDbIsSecure = flag.Bool("db.secure", false, "use secure connection with database")
+var argSampleSize = flag.Int("samples", 1024, "number of samples we want to keep")
+var argHistoryDuration = flag.Int("history_duration", 60, "number of seconds of container history to keep")
+var argDbUsername = flag.String("storage_driver.user", "root", "database username")
+var argDbPassword = flag.String("storage_driver.password", "root", "database password")
+var argDbHost = flag.String("storage_driver.host", "localhost:8086", "database host:port")
+var argDbName = flag.String("storage_driver.name", "cadvisor", "database name")
+var argDbIsSecure = flag.Bool("storage_driver.secure", false, "use secure connection with database")
 
-func NewStorage(driverName string) (storage.StorageDriver, error) {
+func NewStorageDriver(driverName string) (storage.StorageDriver, error) {
 	var storageDriver storage.StorageDriver
 	var err error
 	switch driverName {