Commit 694acba6 authored by Cristiano Urban's avatar Cristiano Urban
Browse files

Minor configuration changes. 



Signed-off-by: default avatarCristiano Urban <cristiano.urban@inaf.it>
parent 6278d6f2

docker-compose.yml

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ version: '3.0' 
services:

  base:

    image: git.ia2.inaf.it:5050/vospace/vospace-transfer-service/base

    build: ./base

    container_name: base

  redis:

    image: git.ia2.inaf.it:5050/vospace/vospace-transfer-service/job_cache

transfer_service/config/vos_ts.conf.sample

+2 −8
Original line number Diff line number Diff line
@@ -90,18 +90,12 @@ block_size = 1 TB 
; on disk after a given amount of time specified here below.

; This amount of time is calculated as the difference between the current time 

; (periodically checked) and the 'endTime' parameter of the job

days = 7

hours = 0

minutes = 0

seconds = 0

files_expiration = { "days": 7, "hours": 0, "minutes": 0, "seconds": 0 }



[cleanup]

; Physically delete from disk all nodes previously deleted by the user via ui,

; that are older than a given amount of time specified here below

days = 0

hours = 0

minutes = 1

seconds = 30

files_expiration = { "days": 0, "hours": 0, "minutes": 1, "seconds": 30 }



[mail]

enable_notifications = false

transfer_service/file_cleaner.py

+4 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#



import datetime

import json

import logging

import os
@@ -33,8 +34,9 @@ class FileCleaner(object): 
                                  1,

                                  1)

        params = config.loadSection("cleanup")

        self.days = params.getint("days")

        self.seconds = params.getint("hours") * 3600 + params.getint("minutes") * 60 + params.getint("seconds")

        self.filesExpiration = json.loads(params["files_expiration"])

        self.days = self.filesExpiration["days"]

        self.seconds = self.filesExpiration["hours"] * 3600 + self.filesExpiration["minutes"] * 60 + self.filesExpiration["seconds"]

        params = config.loadSection("logging")

        self.logger = logging.getLogger("file_cleaner")

        logLevel = "logging." + params["log_level"]

transfer_service/retrieve_cleaner.py

+3 −2
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ class RetrieveCleaner(TaskExecutor): 
        params = config.loadSection("transfer_node")

        self.storageRetrievePath = params["retrieve_path"]

        params = config.loadSection("async_recall")

        self.days = params.getint("days")

        self.seconds = params.getint("hours") * 3600 + params.getint("minutes") * 60 + params.getint("seconds")

        self.filesExpiration = json.loads(params["files_expiration"])

        self.days = self.filesExpiration["days"]

        self.seconds = self.filesExpiration["hours"] * 3600 + self.filesExpiration["minutes"] * 60 + self.filesExpiration["seconds"]

        params = config.loadSection("logging")

        self.logger = logging.getLogger(__name__)

        logLevel = "logging." + params["log_level"]