From eb1db5189b4260a8c7e340b512113b8d12bed0b0 Mon Sep 17 00:00:00 2001
From: Benziane Chakib <chakib.benziane@smartjog.com>
Date: Mon, 20 Dec 2010 17:53:50 +0000
Subject: [PATCH] bug fix when authenticating and validating login in the
server
---
bin/cc-node | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/bin/cc-node b/bin/cc-node
index 53d8ff9..8388992 100755
--- a/bin/cc-node
+++ b/bin/cc-node
@@ -10,7 +10,6 @@ import logging
import logging.handlers
import signal
import threading
-import socket
from time import sleep
from math import exp
@@ -26,7 +25,7 @@ DEFAULT_CONFIG_FILE = '/etc/cc-node.conf'
DEFAULT_PID_FILE = '/var/run/cc-node.pid'
DEFAULT_CONFIGURATION = {
'address': None,
- 'login': '$HOSTNAME',
+ 'login': None,
'password': None,
'port': 1984,
'verbosity': 0,
@@ -68,19 +67,16 @@ def run_node(options):
def authentication():
timeout = 1
- login = options['login'].replace('$HOSTNAME', socket.gethostname())
while node.manager.is_running():
- try:
- node.authentify(login, options['password'])
- except RpcError as error:
- logging.critical('Authentication error: %s' % error)
- sleep(2)
+ result = node.authentify(options['login'], options['password'])
+ if result:
+ logging.info('Authentication suscessfull.')
+ return
else:
timeout += 0.1
print exp(timeout)
sleep(exp(timeout))
- logging.info('Authenticated to server')
- break
+
def shutdown_handler(signum, frame):
'''
--
GitLab