Merge NCPA v3 into master #1016
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Start of all of NCPA running under one service/daemon Fixed issues with different system encoding Upgraded version of Python to 3.5 Switched from gevent-websocket to karellen-geventws (updated with Python 3 support) Moved Listener and Passive to their own threads (working on multiprocessing for Listener later) Moved all setup for cx_Freeze into setup.py (no longer multiple files) All OS-specific sections of NCPA are now located in ncpa.py Added ability to run NCPA in dev/debug mode without building (python ncpa.py -d) Cleaned up frozen/unfrozen os path selections inside the code Updated to use cx_Freeze 5 and fixed includes/bundling of files for installer
As a side note, the reason we are going to have to stick with cffi 1.5.2 for now is that we cannot bundle the libffi that they use in the python package on the frozen script. For whatever reason, the .so file isn't found and cannot be added to ld and ldd shows that the object is missing - which throws errors. Maybe this will get resolved later but for now we will stick with 1.5.2.
(it's a pain for frozen windows cx_Freeze service ...)
- Works now with Python 3.6.6 - Moved resources out of main code folder - Updated some internals for debug mode and logging - Fix Windows build (single-service and installs/builds properly with Python 3)
Add the new service def for systemd systems
# Conflicts: # .travis.yml # CHANGES.rst # VERSION # agent/etc/ncpa.cfg # agent/listener/processes.py # agent/listener/server.py # agent/ncpa_listener.py # agent/ncpa_windows.py # agent/ncpadaemon.py # agent/setup_posix.py # build/Makefile # build/linux/ncpa.spec # build/resources/ncpa.nsi # build/scripts/linux_build_setup.sh # build/scripts/update_python_packages.sh # build/windows/setup.bat # client/CHANGES.rst
# Conflicts: # CHANGES.rst # VERSION # agent/etc/ncpa.cfg # agent/etc/ncpa.cfg.sample # agent/listener/psapi.py # agent/listener/server.py # agent/ncpa_listener.py # agent/ncpa_passive.py # agent/ncpa_windows.py # agent/setup_posix.py # agent/setup_windows.py # build/linux/setup.sh # build/resources/Python-2.7.14.tgz # build/resources/Python-2.7.16.tgz # build/resources/Python-3.6.9.tgz # build/resources/ncpa.nsi # build/solaris/setup.sh # client/CHANGES.rst
Update package.sh
Py3 strings are already unicode, fixing error output in logs
reverting my old change to the graph to fix other graphs
…esfromMasterMerge Fixing/reverting Text from master merge
…FromMaster reverting merge from master changes in server.py
…FromMaster reimplementing security fix from master merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.