Skip to content

Commit

Permalink
chore: fixed start and stop logic in azure session service
Browse files Browse the repository at this point in the history
  • Loading branch information
riccardorotta committed Jun 20, 2022
1 parent 93da8b2 commit cb2b3cd
Show file tree
Hide file tree
Showing 13 changed files with 1,905 additions and 5,331 deletions.
4 changes: 2 additions & 2 deletions dpapi-addon/build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
endif

quiet_cmd_regen_makefile = ACTION Regenerating $@
cmd_regen_makefile = cd $(srcdir); /Users/ericvilla/Projects/leapp/dpapi-addon/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/ericvilla/Library/Caches/node-gyp/16.14.0" "-Dnode_gyp_dir=/Users/ericvilla/Projects/leapp/dpapi-addon/node_modules/node-gyp" "-Dnode_lib_file=/Users/ericvilla/Library/Caches/node-gyp/16.14.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/ericvilla/Projects/leapp/dpapi-addon" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/ericvilla/Projects/leapp/dpapi-addon/build/config.gypi -I/Users/ericvilla/Projects/leapp/dpapi-addon/node_modules/node-gyp/addon.gypi -I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/include/node/common.gypi "--toplevel-dir=." binding.gyp
Makefile: $(srcdir)/../../../Library/Caches/node-gyp/16.14.0/include/node/common.gypi $(srcdir)/binding.gyp $(srcdir)/build/config.gypi $(srcdir)/node_modules/node-gyp/addon.gypi
cmd_regen_makefile = cd $(srcdir); /Users/riccardorotta/WebstormProjects/azure-integration-leapp-2/leapp/dpapi-addon/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/riccardorotta/Library/Caches/node-gyp/18.1.0" "-Dnode_gyp_dir=/Users/riccardorotta/WebstormProjects/azure-integration-leapp-2/leapp/dpapi-addon/node_modules/node-gyp" "-Dnode_lib_file=/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/riccardorotta/WebstormProjects/azure-integration-leapp-2/leapp/dpapi-addon" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/riccardorotta/WebstormProjects/azure-integration-leapp-2/leapp/dpapi-addon/build/config.gypi -I/Users/riccardorotta/WebstormProjects/azure-integration-leapp-2/leapp/dpapi-addon/node_modules/node-gyp/addon.gypi -I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/include/node/common.gypi "--toplevel-dir=." binding.gyp
Makefile: $(srcdir)/build/config.gypi $(srcdir)/node_modules/node-gyp/addon.gypi $(srcdir)/../../../../Library/Caches/node-gyp/18.1.0/include/node/common.gypi $(srcdir)/binding.gyp
$(call do_cmd,regen_makefile)

# "all" is a concatenation of the "all" targets from all the included
Expand Down
77 changes: 45 additions & 32 deletions dpapi-addon/build/config.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,24 @@
"dcheck_always_on": 0,
"debug_nghttp2": "false",
"debug_node": "false",
"enable_lto": "false",
"enable_lto": "true",
"enable_pgo_generate": "false",
"enable_pgo_use": "false",
"error_on_warn": "false",
"force_dynamic_crt": 0,
"host_arch": "x64",
"icu_data_in": "../../deps/icu-tmp/icudt70l.dat",
"icu_endianness": "l",
"icu_gyp_path": "tools/icu/icu-generic.gyp",
"icu_path": "deps/icu-small",
"icu_gyp_path": "tools/icu/icu-system.gyp",
"icu_small": "false",
"icu_ver_major": "70",
"is_debug": 0,
"llvm_version": "11.0",
"llvm_version": "13.1",
"napi_build_version": "8",
"node_byteorder": "little",
"node_debug_lib": "false",
"node_enable_d8": "false",
"node_install_corepack": "true",
"node_install_npm": "true",
"node_fipsinstall": "false",
"node_install_corepack": "false",
"node_install_npm": "false",
"node_library_files": [
"lib/constants.js",
"lib/net.js",
Expand All @@ -46,6 +44,7 @@
"lib/child_process.js",
"lib/assert.js",
"lib/_tls_wrap.js",
"lib/test.js",
"lib/http2.js",
"lib/inspector.js",
"lib/os.js",
Expand Down Expand Up @@ -97,6 +96,7 @@
"lib/stream/consumers.js",
"lib/stream/promises.js",
"lib/stream/web.js",
"lib/readline/promises.js",
"lib/internal/constants.js",
"lib/internal/abort_controller.js",
"lib/internal/net.js",
Expand All @@ -111,6 +111,7 @@
"lib/internal/histogram.js",
"lib/internal/error_serdes.js",
"lib/internal/dgram.js",
"lib/internal/structured_clone.js",
"lib/internal/child_process.js",
"lib/internal/assert.js",
"lib/internal/fixed_queue.js",
Expand Down Expand Up @@ -141,6 +142,10 @@
"lib/internal/http.js",
"lib/internal/buffer.js",
"lib/internal/trace_events_async_hooks.js",
"lib/internal/test_runner/test.js",
"lib/internal/test_runner/harness.js",
"lib/internal/test_runner/utils.js",
"lib/internal/test_runner/tap_stream.js",
"lib/internal/crypto/sig.js",
"lib/internal/crypto/rsa.js",
"lib/internal/crypto/aes.js",
Expand All @@ -167,6 +172,7 @@
"lib/internal/cluster/primary.js",
"lib/internal/cluster/utils.js",
"lib/internal/cluster/child.js",
"lib/internal/webstreams/compression.js",
"lib/internal/webstreams/util.js",
"lib/internal/webstreams/writablestream.js",
"lib/internal/webstreams/readablestream.js",
Expand All @@ -178,6 +184,7 @@
"lib/internal/bootstrap/loaders.js",
"lib/internal/bootstrap/pre_execution.js",
"lib/internal/bootstrap/node.js",
"lib/internal/bootstrap/browser.js",
"lib/internal/bootstrap/environment.js",
"lib/internal/bootstrap/switches/does_not_own_process_state.js",
"lib/internal/bootstrap/switches/is_not_main_thread.js",
Expand Down Expand Up @@ -210,6 +217,7 @@
"lib/internal/streams/duplex.js",
"lib/internal/streams/pipeline.js",
"lib/internal/readline/interface.js",
"lib/internal/readline/promises.js",
"lib/internal/readline/utils.js",
"lib/internal/readline/emitKeypressEvents.js",
"lib/internal/readline/callbacks.js",
Expand All @@ -227,7 +235,6 @@
"lib/internal/per_context/domexception.js",
"lib/internal/vm/module.js",
"lib/internal/tls/secure-pair.js",
"lib/internal/tls/parse-cert-string.js",
"lib/internal/tls/secure-context.js",
"lib/internal/child_process/serialization.js",
"lib/internal/debugger/inspect_repl.js",
Expand All @@ -240,14 +247,17 @@
"lib/internal/main/eval_string.js",
"lib/internal/main/check_syntax.js",
"lib/internal/main/prof_process.js",
"lib/internal/main/test_runner.js",
"lib/internal/main/worker_thread.js",
"lib/internal/main/mksnapshot.js",
"lib/internal/main/inspect.js",
"lib/internal/main/eval_stdin.js",
"lib/internal/main/run_main_module.js",
"lib/internal/modules/run_main.js",
"lib/internal/modules/package_json_reader.js",
"lib/internal/modules/esm/module_job.js",
"lib/internal/modules/esm/assert.js",
"lib/internal/modules/esm/fetch_module.js",
"lib/internal/modules/esm/get_source.js",
"lib/internal/modules/esm/translators.js",
"lib/internal/modules/esm/resolve.js",
Expand All @@ -257,6 +267,7 @@
"lib/internal/modules/esm/initialize_import_meta.js",
"lib/internal/modules/esm/module_map.js",
"lib/internal/modules/esm/get_format.js",
"lib/internal/modules/esm/formats.js",
"lib/internal/modules/esm/loader.js",
"lib/internal/modules/cjs/helpers.js",
"lib/internal/modules/cjs/loader.js",
Expand Down Expand Up @@ -302,20 +313,20 @@
"lib/dns/promises.js",
"lib/fs/promises.js"
],
"node_module_version": 93,
"node_module_version": 108,
"node_no_browser_globals": "false",
"node_prefix": "/",
"node_release_urlbase": "https://nodejs.org/download/release/",
"node_prefix": "/usr/local/Cellar/node/18.1.0",
"node_release_urlbase": "",
"node_shared": "false",
"node_shared_brotli": "false",
"node_shared_cares": "false",
"node_shared_brotli": "true",
"node_shared_cares": "true",
"node_shared_http_parser": "false",
"node_shared_libuv": "false",
"node_shared_nghttp2": "false",
"node_shared_libuv": "true",
"node_shared_nghttp2": "true",
"node_shared_nghttp3": "false",
"node_shared_ngtcp2": "false",
"node_shared_openssl": "false",
"node_shared_zlib": "false",
"node_shared_openssl": "true",
"node_shared_zlib": "true",
"node_tag": "",
"node_target_type": "executable",
"node_use_bundled_v8": "true",
Expand All @@ -327,19 +338,22 @@
"node_use_v8_platform": "true",
"node_with_ltcg": "false",
"node_without_node_options": "false",
"openssl_fips": "",
"openssl_is_fips": "false",
"openssl_quic": "true",
"openssl_quic": "false",
"ossfuzz": "false",
"shlib_suffix": "93.dylib",
"shlib_suffix": "108.dylib",
"target_arch": "x64",
"v8_enable_31bit_smis_on_64bit_arch": 0,
"v8_enable_gdbjit": 0,
"v8_enable_hugepage": 0,
"v8_enable_i18n_support": 1,
"v8_enable_inspector": 1,
"v8_enable_javascript_promise_hooks": 1,
"v8_enable_lite_mode": 0,
"v8_enable_object_print": 1,
"v8_enable_pointer_compression": 0,
"v8_enable_shared_ro_heap": 1,
"v8_enable_short_builtin_calls": 1,
"v8_enable_webassembly": 1,
"v8_no_strict_aliasing": 1,
"v8_optimized_debug": 1,
Expand All @@ -348,18 +362,17 @@
"v8_trace_maps": 0,
"v8_use_siphash": 1,
"want_separate_host_toolset": 0,
"xcode_version": "11.0",
"nodedir": "/Users/ericvilla/Library/Caches/node-gyp/16.14.0",
"nodedir": "/Users/riccardorotta/Library/Caches/node-gyp/18.1.0",
"standalone_static_library": 1,
"metrics_registry": "https://registry.npmjs.org/",
"global_prefix": "/Users/ericvilla/.nvm/versions/node/v16.14.0",
"local_prefix": "/Users/ericvilla/Projects/leapp/dpapi-addon",
"globalconfig": "/Users/ericvilla/.nvm/versions/node/v16.14.0/etc/npmrc",
"userconfig": "/Users/ericvilla/.npmrc",
"init_module": "/Users/ericvilla/.npm-init.js",
"node_gyp": "/Users/ericvilla/.nvm/versions/node/v16.14.0/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js",
"cache": "/Users/ericvilla/.npm",
"user_agent": "npm/8.5.5 node/v16.14.0 darwin x64 workspaces/false",
"prefix": "/Users/ericvilla/.nvm/versions/node/v16.14.0"
"global_prefix": "/usr/local",
"local_prefix": "/Users/riccardorotta/WebstormProjects/azure-integration-leapp-2/leapp/dpapi-addon",
"globalconfig": "/usr/local/etc/npmrc",
"userconfig": "/Users/riccardorotta/.npmrc",
"init_module": "/Users/riccardorotta/.npm-init.js",
"node_gyp": "/usr/local/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js",
"cache": "/Users/riccardorotta/.npm",
"user_agent": "npm/8.8.0 node/v18.1.0 darwin x64 workspaces/false",
"prefix": "/usr/local"
}
}
45 changes: 21 additions & 24 deletions dpapi-addon/build/dpapi.target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ DEFS_Debug := \
'-D_DARWIN_USE_64_BIT_INODE=1' \
'-D_LARGEFILE_SOURCE' \
'-D_FILE_OFFSET_BITS=64' \
'-DOPENSSL_NO_PINSHARED' \
'-DOPENSSL_THREADS' \
'-DBUILDING_NODE_EXTENSION' \
'-DDEBUG' \
'-D_DEBUG' \
Expand All @@ -24,7 +22,7 @@ DEFS_Debug := \
CFLAGS_Debug := \
-O0 \
-gdwarf-2 \
-mmacosx-version-min=10.13 \
-mmacosx-version-min=10.15 \
-arch x86_64 \
-Wall \
-Wendif-labels \
Expand All @@ -37,7 +35,7 @@ CFLAGS_C_Debug := \

# Flags passed to only C++ files.
CFLAGS_CC_Debug := \
-std=gnu++14 \
-std=gnu++17 \
-stdlib=libc++ \
-fno-rtti \
-fno-exceptions \
Expand All @@ -50,13 +48,13 @@ CFLAGS_OBJC_Debug :=
CFLAGS_OBJCC_Debug :=

INCS_Debug := \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/include/node \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/src \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/openssl/config \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/openssl/openssl/include \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/uv/include \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/zlib \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/v8/include \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/include/node \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/src \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/openssl/config \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/openssl/openssl/include \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/uv/include \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/zlib \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/v8/include \
-I$(srcdir)/node_modules/nan \
-I$(srcdir)/include

Expand All @@ -71,15 +69,14 @@ DEFS_Release := \
'-D_DARWIN_USE_64_BIT_INODE=1' \
'-D_LARGEFILE_SOURCE' \
'-D_FILE_OFFSET_BITS=64' \
'-DOPENSSL_NO_PINSHARED' \
'-DOPENSSL_THREADS' \
'-DBUILDING_NODE_EXTENSION'

# Flags passed to all source files.
CFLAGS_Release := \
-O3 \
-gdwarf-2 \
-mmacosx-version-min=10.13 \
-flto \
-mmacosx-version-min=10.15 \
-arch x86_64 \
-Wall \
-Wendif-labels \
Expand All @@ -92,7 +89,7 @@ CFLAGS_C_Release := \

# Flags passed to only C++ files.
CFLAGS_CC_Release := \
-std=gnu++14 \
-std=gnu++17 \
-stdlib=libc++ \
-fno-rtti \
-fno-exceptions \
Expand All @@ -105,13 +102,13 @@ CFLAGS_OBJC_Release :=
CFLAGS_OBJCC_Release :=

INCS_Release := \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/include/node \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/src \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/openssl/config \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/openssl/openssl/include \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/uv/include \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/zlib \
-I/Users/ericvilla/Library/Caches/node-gyp/16.14.0/deps/v8/include \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/include/node \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/src \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/openssl/config \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/openssl/openssl/include \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/uv/include \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/zlib \
-I/Users/riccardorotta/Library/Caches/node-gyp/18.1.0/deps/v8/include \
-I$(srcdir)/node_modules/nan \
-I$(srcdir)/include

Expand Down Expand Up @@ -147,7 +144,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cpp FORCE_DO_CMD
LDFLAGS_Debug := \
-undefined dynamic_lookup \
-Wl,-search_paths_first \
-mmacosx-version-min=10.13 \
-mmacosx-version-min=10.15 \
-arch x86_64 \
-L$(builddir) \
-stdlib=libc++
Expand All @@ -159,7 +156,7 @@ LIBTOOLFLAGS_Debug := \
LDFLAGS_Release := \
-undefined dynamic_lookup \
-Wl,-search_paths_first \
-mmacosx-version-min=10.13 \
-mmacosx-version-min=10.15 \
-arch x86_64 \
-L$(builddir) \
-stdlib=libc++
Expand Down
Loading

0 comments on commit cb2b3cd

Please sign in to comment.