openstack/storlets
Code Issues Proposed changes

Use wildcard for CLASSPATH

Browse Source 
... and avoid usage of file paths. Using file paths makes it difficult
to update library versions, because versions are hard-coded as part
of file paths.

Change-Id: I04b8bec400c89d744ae08bc3b80da1a31907fa85
This commit is contained in:
Takashi Kajinami
2022-06-27 02:06:22 +09:00
parent 1a8d1a73db
commit b8add44326
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
storlets/agent/daemon_factory/server.py
View File

@@ -72,14 +72,7 @@ class StorletDaemonFactory(SBusServer):
lib_dir = "/usr/local/lib/storlets"
java_lib_dir = os.path.join(lib_dir, "java")
jar_deps = ['logback-classic-1.1.2.jar',
'logback-core-1.1.2.jar',
'slf4j-api-1.7.7.jar',
'json_simple-1.1.jar',
'SBusJavaFacade.jar',
'SCommon.jar',
'SDaemon.jar',
'']
jar_deps = ['*', '']
jar_deps = [os.path.join(java_lib_dir, x) for x in jar_deps]
str_dmn_clspth = ':'.join(jar_deps + [storlet_path])
str_library_path = ':'.join([lib_dir, java_lib_dir])

8
tests/unit/agent/daemon_factory/test_server.py
View File

@@ -74,13 +74,7 @@ class TestStorletDaemonFactory(unittest.TestCase):
self.assertIn('CLASSPATH', env)
self.assertEqual(
['/default/classpath',
'/usr/local/lib/storlets/java/logback-classic-1.1.2.jar',
'/usr/local/lib/storlets/java/logback-core-1.1.2.jar',
'/usr/local/lib/storlets/java/slf4j-api-1.7.7.jar',
'/usr/local/lib/storlets/java/json_simple-1.1.jar',
'/usr/local/lib/storlets/java/SBusJavaFacade.jar',
'/usr/local/lib/storlets/java/SCommon.jar',
'/usr/local/lib/storlets/java/SDaemon.jar',
'/usr/local/lib/storlets/java/*',
'/usr/local/lib/storlets/java/',
'path/to/storlet/a'],
env['CLASSPATH'].split(':'))