Merge branch 'master' of github.com:proycon/clam

clam/clamdispatcher.py

@@ -25,7 +25,7 @@
 import signal
 import shutil
 
-VERSION = '2.4.5'
+VERSION = '2.4.7'
 
 sys.path.append(sys.path[0] + '/..')
 

clam/clamservice.py

@@ -2321,6 +2321,8 @@ def DELETE(actionid, credentials=None):
 
 
 def sufficientresources():
+    if not settings.ENABLED:
+        return False, "Service is disabled for maintenance"
     if settings.REQUIREMEMORY > 0:
         if not os.path.exists('/proc/meminfo'):
             printlog("WARNING: No /proc/meminfo available on your system! Not Linux? Skipping memory requirement check!")
@@ -2655,6 +2657,8 @@ def set_defaults():
         settings.OAUTH_ENCRYPTIONSECRET = "%032x" % random.getrandbits(32)
     if 'ENABLEWEBAPP' not in settingkeys:
         settings.ENABLEWEBAPP = True
+    if 'ENABLED' not in settingkeys:
+        settings.ENABLED = True
     if 'REMOTEHOST' not in settingkeys:
         settings.REMOTEHOST = None
     elif 'REMOTEUSER' not in settingkeys:

clam/common/data.py

@@ -37,7 +37,7 @@
 import clam.common.util
 import clam.common.viewers
 
-VERSION = '2.4.5'
+VERSION = '2.4.7'
 
 #dirs for services shipped with CLAM itself
 CONFIGDIR = os.path.abspath(os.path.dirname(__file__) + '/../config/')

clam/common/viewers.py

@@ -64,7 +64,7 @@ def __init__(self, id, name, forwarder, **kwargs):
         super(ForwardViewer,self).__init__(**kwargs)
 
     def view(self, file, **kwargs):
-        self.forwarder(None, file)
+        self.forwarder(None, None, outputfile=file) #this sets the forwardlink on the instance
         r = requests.get(self.forwarder.forwardlink, allow_redirects=True)
         if r.status_code == 302 and 'Location' in r.headers:
             url = r.headers['Location']

codemeta.json

@@ -10,7 +10,7 @@
     "@type": "SoftwareSourceCode",
     "identifier": "clam",
     "name": "CLAM",
-    "version": "2.4.5",
+    "version": "2.4.7",
     "description": "Quickly turn command-line applications into RESTful webservices with a web-application front-end. You provide a specification of your command line application, its input, output and parameters, and CLAM wraps around your application to form a fully fledged RESTful webservice. ",
     "license": "https://spdx.org/licenses/GPL-3.0",
 	"url": "https://proycon.github.io/clam",

setup.py

@@ -13,7 +13,7 @@ def read(fname):
 
 setup(
     name = "CLAM",
-    version = "2.4.5", #also change in clam.common.data.VERSION and dispatcher.py and codemeta.json
+    version = "2.4.7", #also change in clam.common.data.VERSION and dispatcher.py and codemeta.json
     author = "Maarten van Gompel",
     author_email = "proycon@anaproy.nl",
     description = ("Turns command-line NLP tools into fully-fledged RESTful webservices with an auto-generated web-interface for human end-users."),