Updated

Author: djthorpe

Makefile

@@ -15,7 +15,7 @@ PLUGIN_DIR = $(wildcard plugin/*)
 
 .PHONY: all server plugins dependencies mkdir clean 
 
-all: clean server plugins
+all: clean plugins server 
 
 server: dependencies mkdir
 	@echo Build server

etc/server.yaml

@@ -6,22 +6,27 @@ plugins:
 
 # HTTP Server parameters
 httpserver:
+  # Port to listen on. Can be a path to unix socket to serve through FastCGI
   addr: :80
 
-# Handlers for serving plugins  
+# Handlers for serving plugins
 handlers:
   sqlite3:
-    prefix: /
+    # The sqlite3 plugin can be viewed at http://localhost/api/sqlite
+    prefix: /api/sqlite
+    # Requests are logged
     middleware:
       - log
 
 sqlite3:
-  # Databases to load and/or create
+  # Databases to load and/or create. Only the 'main' database is required.
   databases:
     main: ":memory:"
-  # Set trace to true to enable the ability to profile queries
+  # Set create to true to allow databases which don't exist to be created.
+  create: true
+  # Set trace to true to enable the ability to profile queries. Profiling information
+  # can be displayed through the API.
   trace: true
   # Set max number of connections that can be simultaneously opened
   max: 100
 
-

pkg/sqlite3/pool.go

@@ -29,6 +29,7 @@ type PoolConfig struct {
 	Max     int64             `yaml:"max"`       // The maximum number of connections in the pool
 	Schemas map[string]string `yaml:"databases"` // Schema names mapped onto path for database file
 	Trace   bool              `yaml:"trace"`     // Profiling for statements
+	Create  bool              `yaml:"create"`    // When false, do not allow creation of new file-based databases
 	Auth    SQAuth            // Authentication and Authorization interface
 	Flags   sqlite3.OpenFlags // Flags for opening connections
 }
@@ -54,6 +55,7 @@ var (
 	defaultPoolConfig = PoolConfig{
 		Max:     5,
 		Trace:   false,
+		Create:  true,
 		Schemas: map[string]string{defaultSchema: defaultMemory},
 		Flags:   sqlite3.DefaultFlags | sqlite3.SQLITE_OPEN_SHAREDCACHE,
 	}
@@ -90,6 +92,13 @@ func OpenPool(config PoolConfig, errs chan<- error) (*Pool, error) {
 		config.Flags = defaultPoolConfig.Flags
 	}
 
+	// Update create flag
+	if config.Create {
+		config.Flags |= sqlite3.SQLITE_OPEN_CREATE
+	} else {
+		config.Flags &^= sqlite3.SQLITE_OPEN_CREATE
+	}
+
 	// Set up pool
 	p.PoolConfig = config
 	p.Pool = sync.Pool{New: func() interface{} {

plugin/sqlite3/main.go

@@ -61,7 +61,7 @@ func (p *plugin) Run(ctx context.Context, provider Provider) error {
 		return err
 	}
 
-	// Run until cancelled
+	// Run until cancelled - print any errors from the connection pool
 FOR_LOOP:
 	for {
 		select {