summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMatthew Holt <[email protected]>2016-08-23 22:32:52 -0600
committerMatthew Holt <[email protected]>2016-08-23 22:32:52 -0600
commitc3e07334062cfcfcb80c0180eb6240cd0ada8b4f (patch)
tree453459eb6b39466c72c1726cbfeb31326eec1eb0
parent70cbfdc585a6d31f6c6e92b37a97e786618b4dce (diff)
downloadcaddy-c3e07334062cfcfcb80c0180eb6240cd0ada8b4f.tar.gz
caddy-c3e07334062cfcfcb80c0180eb6240cd0ada8b4f.zip
Only move storage if actually starting a server (closes #1067)
-rw-r--r--caddy/caddymain/run.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/caddy/caddymain/run.go b/caddy/caddymain/run.go
index e83ecc173..b40c49b16 100644
--- a/caddy/caddymain/run.go
+++ b/caddy/caddymain/run.go
@@ -48,7 +48,6 @@ func init() {
// Run is Caddy's main() function.
func Run() {
flag.Parse()
- moveStorage() // TODO: This is temporary for the 0.9 release, or until most users upgrade to 0.9+
caddy.AppName = appName
caddy.AppVersion = appVersion
@@ -92,6 +91,8 @@ func Run() {
os.Exit(0)
}
+ moveStorage() // TODO: This is temporary for the 0.9 release, or until most users upgrade to 0.9+
+
// Set CPU cap
err := setCPU(cpu)
if err != nil {