Commita485106

committed

Clean up public task namespace

Tasks imported into other Fabric task files are exposed publicly - see:http://docs.fabfile.org/en/latest/usage/tasks.html#namespacesThis commit cleans up those imports so we don't pollute the publicnamespace.Fixesalphagov#120

1 parentcd34adb commita485106Copy full SHA for a485106

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`fromfabric.apiimport*`
`2`	`2`
`3`		`-fromcacheimportpurgeascache_purge`
	`3`	`+importcache`
`4`	`4`
`5`	`5`	`@task`
`6`	`6`	`@runs_once`
`@@ -16,5 +16,5 @@ def fastly_purge(*args):`
`16`	`16`	`@task`
`17`	`17`	`defpurge_all(*args):`
`18`	`18`	`"Purge items from Fastly and cache machines, eg\"/one,/two,/three\""`
`19`		`-execute(cache_purge,*args)`
	`19`	`+execute(cache.purge,*args)`
`20`	`20`	`execute(fastly_purge,*args)`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,8 @@`
`2`	`2`	`fromfabric.utilsimporterror`
`3`	`3`	`importre`
`4`	`4`
	`5`	`+importnagios`
	`6`	`+`
`5`	`7`	`@task`
`6`	`8`	`defuptime():`
`7`	`9`	`"""Show uptime and load"""`
`@@ -89,8 +91,7 @@ def reboot():`
`89`	`91`	`@task`
`90`	`92`	`defforce_reboot():`
`91`	`93`	`"""Schedule a host for downtime in nagios and force reboot (even if not required)"""`
`92`		`-fromnagiosimportschedule_downtime`
`93`		`-execute(schedule_downtime,env['host_string'])`
	`94`	`+execute(nagios.schedule_downtime,env['host_string'])`
`94`	`95`	`run("sudo shutdown -r now")`
`95`	`96`
`96`	`97`	`@task`
`@@ -100,8 +101,7 @@ def poweroff():`
`100`	`101`	`Usage:`
`101`	`102`	`fab production -H frontend-1.frontend.production vm.poweroff`
`102`	`103`	`"""`
`103`		`-fromnagiosimportschedule_downtime`
`104`		`-execute(schedule_downtime,env['host_string'])`
	`104`	`+execute(nagios.schedule_downtime,env['host_string'])`
`105`	`105`	`run("sudo poweroff")`
`106`	`106`
`107`	`107`	`@task`

Comments

(0)