lukechilds
/
easyengine
mirror of https://github.com/lukechilds/easyengine.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'python' of github.com:rtCamp/easyengine into python

bugfixes
gau1991 10 years ago
parent
3802ef87f4 9f818ee227
commit
f98556dfaa
5 changed files with 90 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ee/cli/main.py
  2. 2
      ee/cli/plugins/stack.py
  3. 8
      ee/cli/plugins/stack_services.py
  4. 100
      ee/core/aptget.py
  5. 16
      ee/core/services.py

4
ee/cli/main.py
View File

@ -24,8 +24,8 @@ class EEApp(foundation.CementApp):
label = 'ee'
# Log writing to file
# defaults = init_defaults('ee', 'log.logging')
# defaults['log.logging']['file'] = '/tmp/my.log'
defaults = init_defaults('ee', 'log.logging')
defaults['log.logging']['file'] = '/tmp/my.log'
config_defaults = defaults

2
ee/cli/plugins/stack.py
View File

@ -414,7 +414,7 @@ class EEStackController(CementBaseController):
]
if len(apt_packages):
pkg.purge(apt_packages)
pkg.remove(apt_packages, purge=True)
if len(packages):
EEFileUtils.remove(packages)

8
ee/cli/plugins/stack_services.py
View File

@ -34,7 +34,7 @@ class EEStackStatusController(CementBaseController):
else:
services = services + ['nginx', 'php5-fpm', 'mysql', 'postfix']
for service in services:
EEService.start_service(service)
EEService.start_service(self, service)
@expose(help="stop stack services")
def stop(self):
@ -54,7 +54,7 @@ class EEStackStatusController(CementBaseController):
else:
services = services + ['nginx', 'php5-fpm', 'mysql', 'postfix']
for service in services:
EEService.stop_service(service)
EEService.stop_service(self, service)
@expose(help="restart stack services")
def restart(self):
@ -74,7 +74,7 @@ class EEStackStatusController(CementBaseController):
else:
services = services + ['nginx', 'php5-fpm', 'mysql', 'postfix']
for service in services:
EEService.restart_service(service)
EEService.restart_service(self, service)
@expose(help="get stack status")
def status(self):
@ -94,5 +94,5 @@ class EEStackStatusController(CementBaseController):
else:
services = services + ['nginx', 'php5-fpm', 'mysql', 'postfix']
for service in services:
if EEService.get_service_status(service):
if EEService.get_service_status(self, service):
print("{0}: Running".format(service))

100
ee/core/aptget.py
View File

@ -1,6 +1,5 @@
"""EasyEngine package installation using apt-get module."""
import apt
import apt_pkg
import sys
@ -110,29 +109,84 @@ class EEAptGet:
return(False)
return(True)
def remove(self, packages, purge_value=False):
"""Removal of packages Similar to apt-get remove"""
self.__init__()
def __dependencies_loop(self, deplist, pkg, onelevel=False):
""" Loops through pkg's dependencies.
Returns a list with every package found. """
if not self.cache:
self.cache = apt.Cache()
if onelevel:
onelevellist = []
if not pkg.is_installed:
return
for depf in pkg.installed.dependencies:
for dep in depf:
if (dep.name in self.cache and not self.cache[dep.name]
in deplist):
deplist.append(self.cache[dep.name])
self.__dependencies_loop(deplist, self.cache[dep.name])
if onelevel:
if dep.name in self.cache:
onelevellist.append(self.cache[dep.name])
if onelevel:
return onelevellist
def remove(self, packages, auto=True, purge=False):
my_selected_packages = []
# apt cache Initialization
self.cache = apt.Cache()
# Read cache i.e package list
self.cache.open()
for package in packages:
pkg = self.cache[package]
# Check if packages installed
if pkg.is_installed and not pkg.marked_delete:
with self.cache.actiongroup():
# Mark packages for delete
# Mark to purge package if purge_value is True
pkg.mark_delete(purge=purge_value)
my_selected_packages.append(pkg.name)
print("processing", package)
package = self.cache[package]
if not package.is_installed:
print("Package '{package_name}' is not installed,"
" so not removed."
.format(package_name=package.name))
continue
if package.marked_delete:
continue
else:
my_selected_packages.append(package.name)
# How logic works:
# 1) We loop trough dependencies's dependencies and add them to
# the list.
# 2) We sequentially remove every package in list
# - via is_auto_installed we check if we can safely remove it
deplist = []
onelevel = self.__dependencies_loop(deplist, package,
onelevel=True)
# Mark for deletion the first package, to fire up auto_removable
# Purge?
if purge:
package.mark_delete(purge=True)
else:
# Check If package not already marked for delete
if not pkg.marked_delete:
print("Package '{package_name}' is not installed,"
" so not removed."
.format(package_name=package))
package.mark_delete(purge=False)
# Also ensure we remove AT LEAST the first level of dependencies
# (that is, the actual package's dependencies).
if auto:
markedauto = []
for pkg in onelevel:
if (not pkg.marked_install and pkg.is_installed
and not pkg.is_auto_installed):
pkg.mark_auto()
markedauto.append(pkg)
for pkg in deplist:
if (not pkg.marked_install and pkg.is_installed and
pkg.is_auto_removable):
# Purge?
if purge:
pkg.mark_delete(purge=True)
else:
pkg.mark_delete(purge=False)
# Restore auted items
for pkg in markedauto:
if not pkg.marked_delete:
pkg.mark_auto(False)
else:
# We need to ensure that the onelevel packages are not marked
# as automatically installed, otherwise the user may drop
# them via autoremove or aptitude.
for pkg in onelevel:
if pkg.is_installed and pkg.is_auto_installed:
pkg.mark_auto(auto=False)
# Check if packages available for remove/update.
if self.cache.delete_count > 0:
@ -150,7 +204,3 @@ class EEAptGet:
.format(err=str(e)))
return(False)
return(True)
def purge(self, packages):
"""Purging of packages similar to apt-get purge"""
return(self.remove(packages, purge_value=True))

16
ee/core/services.py
View File

@ -11,19 +11,19 @@ class EEService():
# TODO method for services
pass
def start_service(service_name):
def start_service(self, service_name):
try:
retcode = subprocess.getstatusoutput('service {0} start'
.format(service_name))
if retcode[0] == 0:
print("Started : {0}".format(service_name))
else:
print(retcode[1])
self.app.log.error(retcode[1])
except OSError as e:
print("Execution failed:", e)
self.app.log.error("Execution failed:", e)
return False
def stop_service(service_name):
def stop_service(self, service_name):
try:
retcode = subprocess.getstatusoutput('service {0} stop'
.format(service_name))
@ -33,17 +33,17 @@ class EEService():
else:
return False
except OSError as e:
print("Execution failed:", e)
self.app.log.error("Execution failed:", e)
return False
def restart_service(service_name):
def restart_service(self, service_name):
try:
EEService.stop_service(service_name)
EEService.start_service(service_name)
except OSError as e:
print("Execution failed:", e)
self.app.log.error("Execution failed:", e)
def get_service_status(service_name):
def get_service_status(self, service_name):
try:
is_exist = subprocess.getstatusoutput('which {0}'
.format(service_name))[0]

Write Preview
Loading…
Cancel
Save