Changeset 2966


Ignore:
Timestamp:
Nov 30, 2016, 6:20:04 PM (3 years ago)
Author:
mabarracus
Message:

Fix debugging mode into collector
Fix n4d checking

Location:
lliurex-statistics/trunk/fuentes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • lliurex-statistics/trunk/fuentes/debian/changelog

    r2963 r2966  
     1lliurex-statistics (0.2-4) xenial; urgency=medium
     2
     3  * Fix debugging mode into collector
     4  * Fix n4d checking
     5
     6 -- M.Angel Juan <m.angel.juan@gmail.com>  Wed, 30 Nov 2016 17:09:10 +0100
     7
    18lliurex-statistics (0.2-3) xenial; urgency=medium
    29
  • lliurex-statistics/trunk/fuentes/lliurex-statistics.install/etc/init.d/analytics

    r2962 r2966  
    2121SCRIPTNAME=/etc/init.d/"$NAME"
    2222STATUS_FILE=/etc/lliurex-analytics/status
     23LOCK_FILE=/var/run/analytics.lock
    2324
    2425# Exit if the package is not installed
     
    3940    fi
    4041}
     42remove_locks()
     43{
     44    if [ -f "${LOCK_FILE}" ]; then
     45        log_success_msg "Removing lockfile ${LOCK_FILE}"
     46        rm -f ${LOCK_FILE}
     47    fi
     48}
    4149#
    4250# Function that starts the daemon/service
     
    4957        #   2 if daemon could not be started
    5058        set_acls
     59        remove_locks
    5160        start-stop-daemon --start --quiet --pidfile "$PIDFILE" --exec "$DAEMON" -- \
    5261                $EXTRAOPTIONS \
  • lliurex-statistics/trunk/fuentes/lliurex-statistics.install/usr/sbin/analytics

    r2963 r2966  
    9090
    9191def check_server_acknowledge():
    92         c = xmlrpclib.ServerProxy("https://server:9779/")
    93         return c.get_variable("","VariablesManager","STATS_ENABLED")
     92        try:
     93            c = xmlrpclib.ServerProxy("https://server:9779/")
     94            return c.get_variable("","VariablesManager","STATS_ENABLED")
     95        except:
     96            return '0'
    9497#END def check_server_acknowledge()
    9598
     
    466469filename=''  #initializes as global when is called get_filename
    467470next_filename=get_filename(LOGPATH)
    468 debug("filename="+filename+' next='+next_filename)
    469471
    470472server = config.get('Server','server');
     
    489491INTERPRETERS = config.get('Audit','interpreters').split(',')
    490492
    491 
     493debug("filename="+filename+' next='+next_filename)
    492494
    493495if __name__ == '__main__':
Note: See TracChangeset for help on using the changeset viewer.