HDE · yxd-hde · Feb 10, 2017 · Dec 17, 2015 · Sep 29, 2016 · Feb 10, 2017
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -12,3 +12,8 @@ Version 0.1.2
 -------------
 
     - Add more commandline options.
+
+Version 0.1.3
+-------------
+
+    - Exit with non-zero code when execution of function fails.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # python-lambda-local
 
 [![Join the chat at https://gitter.im/HDE/python-lambda-local](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/HDE/python-lambda-local?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![wercker status](https://app.wercker.com/status/04f5bc5b7de3d5c6f13eb5b871035226/s "wercker status")](https://app.wercker.com/project/bykey/04f5bc5b7de3d5c6f13eb5b871035226)
 
 Run lambda function on local machine
 

diff --git a/lambda_local/__init__.py b/lambda_local/__init__.py
@@ -14,13 +14,12 @@
 
 def main():
     args = parse_args()
-    try:
-        p = Process(target=run, args=(args,))
-        p.start()
-        p.join()
-    except:
-        e = sys.exc_info()
-        print(e[1])
+
+    p = Process(target=run, args=(args,))
+    p.start()
+    p.join()
+
+    sys.exit(p.exitcode)
 
 
 def parse_args():

diff --git a/lambda_local/main.py b/lambda_local/main.py
@@ -24,6 +24,12 @@
 urllib3.disable_warnings()
 
 
+ERR_TYPE_EXCEPTION = 0
+ERR_TYPE_TIMEOUT = 1
+
+EXITCODE_ERR = 1
+
+
 def run(args):
     e = event.read_event(args.event)
     c = context.Context(args.timeout, args.arn_string, args.version_name)
@@ -40,10 +46,7 @@ def run(args):
     logger.info("START RequestId: {}".format(request_id))
 
     start_time = timeit.default_timer()
-    try:
-        result = execute(func, e, c)
-    except TimeoutException as te:
-        result = te
+    result, err_type = execute(func, e, c)
     end_time = timeit.default_timer()
 
     logger.info("END RequestId: {}".format(request_id))
@@ -57,6 +60,9 @@ def run(args):
     logger.info("REPORT RequestId: {}\tDuration: {}".format(
         request_id, duration))
 
+    if err_type is not None:
+        sys.exit(EXITCODE_ERR)
+
 
 def load_lib(path):
     sys.path.append(os.path.abspath(path))
@@ -75,17 +81,21 @@ def load(request_id, path, function_name):
 
 
 def execute(func, event, context):
+    err_type = None
+
     try:
         with time_limit(context.timeout):
             result = func(event, context.activate())
     except TimeoutException as err:
-        raise err
+        result = err
+        err_type = ERR_TYPE_TIMEOUT
     except:
         err = sys.exc_info()
         result = json.dumps({
             "errorMessage": str(err[1]),
             "stackTrace": traceback.extract_tb(err[2]),
             "errorType": err[0].__name__
         }, indent=4, separators=(',', ': '))
+        err_type = ERR_TYPE_EXCEPTION
 
-    return result
+    return result, err_type
diff --git a/setup.py b/setup.py
@@ -26,7 +26,7 @@ def run_tests(self):
         sys.exit(pytest.main(self.test_args))
 
 
-version = "0.1.2"
+version = "0.1.3"
 
 setup(name="python-lambda-local",
       version=version,

diff --git a/wercker.yml b/wercker.yml
@@ -2,6 +2,11 @@ box: python:2.7-slim
 
 build:
   steps:
+    - script:
+        name: virtualenv install
+        code: |
+          pip install virtualenv
+
     - virtualenv:
         name: setup virtual environment
         install_wheel: true # Enable wheel to speed up builds (experimental)