Skip to content

Commit ac5e399

Browse files
committed
Merge branch 'master' into feature/tag_capable
2 parents 44c96b2 + 5b797a3 commit ac5e399

5 files changed

Lines changed: 32 additions & 16 deletions

File tree

CHANGELOG.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ All notable changes to the kytos project will be documented in this file.
66
UNRELEASED - Under development
77
******************************
88

9+
[2025.2.0] - 2026-02-02
10+
***********************
11+
912
Changed
1013
=======
1114
- ``controller`` now holds the dictionary of ``links`` and it can be accessed by other NApps by calling ``self.controller.links``.
@@ -17,6 +20,7 @@ Changed
1720
Fixed
1821
=====
1922
- Enhanced docker mongo setup script (rs-init.sh) to properly run on PRIMARY node
23+
- Fixed hanging when NApp startup raised an Exception.
2024

2125
Added
2226
=====

README.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,11 @@ Submit an Issue
168168
If you find a bug or a mistake in the documentation, you can help us by
169169
submitting an issue to our `repo <https://github.com/kytos-ng/kytos>`_.
170170

171+
Project History
172+
===============
173+
174+
You can find a summary about this project `development history here <https://github.com/kytos-ng/kytos/discussions/607>`_
175+
171176

172177
Authors
173178
*******

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
# built documents.
6565
#
6666
# The short X.Y version.
67-
version = u'2025.1.0'
67+
version = u'2025.2.0'
6868
show_version = False
6969
# The full version, including alpha/beta/rc tags.
70-
release = u'2025.1.0'
70+
release = u'2025.2.0'
7171

7272
# The language for content autogenerated by Sphinx. Refer to documentation
7373
# for a list of supported languages.

kytos/core/kytosd.py

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -147,27 +147,34 @@ async def start_shell_async(controller, executor):
147147

148148

149149
def async_main(config):
150-
"""Start main Kytos Daemon with asyncio loop."""
150+
"""Start main Kytos Daemon with asyncio loop.
151+
1. Run controller first. To ensure any installation issues are caught.
152+
The controller will exit if any problem is found which is caught in
153+
SystemExit.
154+
2. Create task for the shell so it starts immediately after loop.
155+
3. Loop run forever.
156+
"""
151157
loop = asyncio.new_event_loop()
152158
asyncio.set_event_loop(loop)
153-
154159
controller = Controller(config, loop)
155-
156160
if controller.options.debug:
157161
loop.set_debug(True)
158-
159-
loop.run_until_complete(controller.start())
160-
161162
shell_task = None
162-
if controller.options.foreground:
163-
executor = ThreadPoolExecutor(max_workers=1)
164-
shell_task = loop.create_task(start_shell_async(controller, executor))
165-
166-
kill_handler = functools.partial(stop_controller, controller, shell_task)
167-
loop.add_signal_handler(signal.SIGINT, kill_handler)
168-
loop.add_signal_handler(signal.SIGTERM, kill_handler)
169163

170164
try:
165+
loop.run_until_complete(controller.start())
166+
if controller.options.foreground:
167+
executor = ThreadPoolExecutor(max_workers=1)
168+
shell_task = loop.create_task(
169+
start_shell_async(controller, executor)
170+
)
171+
172+
kill_handler = functools.partial(
173+
stop_controller, controller, shell_task
174+
)
175+
loop.add_signal_handler(signal.SIGINT, kill_handler)
176+
loop.add_signal_handler(signal.SIGTERM, kill_handler)
177+
171178
loop.run_forever()
172179
except SystemExit as exc:
173180
print(exc)

kytos/core/metadata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
The present metadata is intended to be used mainly on the setup.
44
"""
5-
__version__ = '2025.1.0'
5+
__version__ = '2025.2.0'
66
__author__ = 'Kytos Team'
77
__author_email__ = 'devel@lists.kytos.io'
88
__license__ = 'MIT'

0 commit comments

Comments
 (0)