diff options
| author | Joseph Henry <josephjah@gmail.com> | 2016-08-17 17:43:44 -0700 |
|---|---|---|
| committer | Joseph Henry <josephjah@gmail.com> | 2016-08-17 17:43:44 -0700 |
| commit | 5d37eabb59f189723199b213172305b5208d48a5 (patch) | |
| tree | 5fe1613dd035f21e5ca1aee523e46414c922c04c /service/OneService.cpp | |
| parent | 169664ffc2c281500a396588df2d5724a79b5723 (diff) | |
| parent | 4c0a7c0fb2645f172083aaa604c1a02c9a08c9f4 (diff) | |
| download | infinitytier-5d37eabb59f189723199b213172305b5208d48a5.tar.gz infinitytier-5d37eabb59f189723199b213172305b5208d48a5.zip | |
Merge branch 'edge' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into edge
Diffstat (limited to 'service/OneService.cpp')
| -rw-r--r-- | service/OneService.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 74628168..7ce45beb 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -1705,7 +1705,11 @@ public: if (_controlPlane) scode = _controlPlane->handleRequest(tc->from,tc->parser.method,tc->url,tc->headers,tc->body,data,contentType); else scode = 500; + } catch (std::exception &exc) { + fprintf(stderr,"WARNING: unexpected exception processing control HTTP request: %s" ZT_EOL_S,exc.what()); + scode = 500; } catch ( ... ) { + fprintf(stderr,"WARNING: unexpected exception processing control HTTP request: unknown exceptino" ZT_EOL_S); scode = 500; } |