Use python logging in install / log cherrypy at right severity

[cascardo/ipsilon.git] / ipsilon / login / authform.py

diff --git a/ipsilon/login/authform.py b/ipsilon/login/authform.py
old mode 100755 (executable)
new mode 100644 (file)
index 45c92a5..ecce919
--- a/ipsilon/login/authform.py
+++ b/ipsilon/login/authform.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python
-#
 # Copyright (C) 2014  Simo Sorce <simo@redhat.com>
 #
 # see file 'COPYING' for use and warranty information
@@ -17,13 +15,15 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from ipsilon.login.common import LoginFormBase, LoginManagerBase
+from ipsilon.login.common import LoginFormBase, LoginManagerBase, \
+    LoginManagerInstaller
 from ipsilon.util.plugin import PluginObject
 from ipsilon.util.user import UserSession
 from ipsilon.util import config as pconfig
 from string import Template
 import cherrypy
 import subprocess
+import logging
 
 
 class Form(LoginFormBase):
@@ -39,7 +39,7 @@ class Form(LoginFormBase):
                 error = cherrypy.request.headers['EXTERNAL_AUTH_ERROR']
             except KeyError:
                 error = "Unknown error using external authentication"
-                cherrypy.log.error("Error: %s" % error)
+                cherrypy.log.error("Error: %s" % error, logging.ERROR)
             return self.lm.auth_failed(self.trans)
 
 
@@ -102,11 +102,11 @@ LoadModule authnz_pam_module modules/mod_authnz_pam.so
 """
 
 
-class Installer(object):
+class Installer(LoginManagerInstaller):
 
     def __init__(self, *pargs):
+        super(Installer, self).__init__()
         self.name = 'form'
-        self.ptype = 'login'
         self.pargs = pargs
 
     def install_args(self, group):