← Back to branch summary

~mterry/url-dispatcher/snap-support

« back to all changes in this revision

Viewing changes to service/service.c

  • Committer: Michael Terry
  • Date: 2016-11-08 22:14:54 UTC
  • mfrom: (93.1.2 url-dispatcher)
  • Revision ID: michael.terry@canonical.com-20161108221454-e777vqecva4helrm
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
service/service.c
40
40
        guint term_source = g_unix_signal_add(SIGTERM, sig_term, mainloop);
41
41
 
42
42
        OverlayTracker * tracker = overlay_tracker_new();
43
 
        if (!dispatcher_init(mainloop, tracker)) {
 
43
 
 
44
        ScopeChecker * checker = NULL;
 
45
        /* Allow disabing for testing */
 
46
        if (g_getenv("URL_DISPATCHER_DISABLE_SCOPE_CHECKING") == NULL)
 
47
                checker = scope_checker_new();
 
48
 
 
49
        /* Initialize Dispatcher */
 
50
        if (!dispatcher_init(mainloop, tracker, checker)) {
44
51
                return -1;
45
52
        }
46
53
 
50
57
        /* Clean up globals */
51
58
        dispatcher_shutdown();
52
59
        overlay_tracker_delete(tracker);
 
60
        scope_checker_delete(checker);
53
61
        g_source_remove(term_source);
54
62
        g_main_loop_unref(mainloop);
55
63