Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge NCPA v3 into master #1016

Merged
merged 178 commits into from
Nov 15, 2023
Merged

Merge NCPA v3 into master #1016

merged 178 commits into from
Nov 15, 2023

Conversation

sawolf
Copy link
Contributor

@sawolf sawolf commented Nov 10, 2023

No description provided.

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
ne-bbahn and others added 28 commits November 13, 2023 08:45
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
@ne-bbahn ne-bbahn merged commit dce4c60 into master Nov 15, 2023
2 checks passed
@ne-bbahn ne-bbahn deleted the dev-v3 branch February 29, 2024 21:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants