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

NerlMonitor #236

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
99b39d0
init
Jun 24, 2023
b660a34
Update READme.md
GuyPerets106 Jul 16, 2023
afe543b
Update README.md
Jul 16, 2023
054e573
[NERLMONITOR] add attacher files
leondavi Jul 17, 2023
ae13017
[NerlMonitor] Added files
GuyPerets106 Jul 18, 2023
253c187
[NerlMonitor] Handler updates
Jul 20, 2023
79a0e06
[NERLMONITOR] Added MonitorGUI.py
GuyPerets106 Jul 18, 2023
b303eec
[nerlMonitor] updated files
Jul 21, 2023
991b342
[NerlMonitor] Updated MonitorGUI
GuyPerets106 Jul 21, 2023
ac2fc31
[NerlMonitor] Updated files for messages passing
GuyPerets106 Jul 21, 2023
4021fcf
Updated NerlMonitorGUI and First Communication with MainServer
GuyPerets106 Aug 1, 2023
9ad8cde
Added WorkersMap to NerlGraph
GuyPerets106 Aug 1, 2023
9e76992
add monitor functionality to entities
Aug 1, 2023
86f32e4
Changed WorkersMap Format
GuyPerets106 Aug 1, 2023
6ef37b8
added worker down cast handel for main server
galhilu Aug 2, 2023
3aa8bab
Updated Json and Port for exp
GuyPerets106 Aug 2, 2023
3dcf863
Fixed ets:new declaration in main server
GuyPerets106 Aug 2, 2023
5e45ba8
Update README.md
leondavi Aug 1, 2023
afb9e94
Updated NerlMonitor directory as rebar3 app
GuyPerets106 Aug 3, 2023
c79f1d6
added hadle info for client states for worker fall detection
galhilu Aug 3, 2023
3943ccb
NerlGraph sent from MainServer in right format
GuyPerets106 Aug 3, 2023
a53dd31
[NerlMonitor] Added worker failure tolerance
GuyPerets106 Aug 5, 2023
6024cc4
[NerlMonitor] Fix aServer behaviour, more LOG msgs
GuyPerets106 Aug 5, 2023
e2ee54b
[NerlMonitor] Added worker termination for tests
GuyPerets106 Aug 7, 2023
2173654
[NerlMonitor] Changed NerlGraph colors added log-msg
GuyPerets106 Aug 8, 2023
3aa34ab
[NerlMonitor] Added worker_kill option
GuyPerets106 Aug 8, 2023
d86129d
[NerlMonitor] Added statistics
GuyPerets106 Aug 10, 2023
748d94b
[NerlMonitor] Added worker termination from GUI
GuyPerets106 Aug 10, 2023
298dea9
[NerlMonitor] Updated Worker Termination NerlGraph
GuyPerets106 Aug 13, 2023
df3c017
[NerlMonitor] debug of worker kill
galhilu Aug 13, 2023
5c10a93
Merge branch 'NerlMonitor' of github.com:leondavi/NErlNet into NerlMo…
galhilu Aug 13, 2023
874136e
[NerlMonitor] Tests
GuyPerets106 Aug 13, 2023
431ff90
[NerlMonitor] Added worker termination
GuyPerets106 Aug 13, 2023
aa48eae
[NerlMonitor] Statistics receive
GuyPerets106 Aug 13, 2023
594d77b
[NerlMonitor] Final commit before testing
GuyPerets106 Aug 14, 2023
61c9a9a
[NerlMonitor] comment editing
galhilu Aug 15, 2023
eda9e96
[NerlMonitor] Final commit
GuyPerets106 Aug 16, 2023
102a6f2
[NerlMonitor] Router bug
GuyPerets106 Aug 17, 2023
aea1796
Update README.md
GuyPerets106 Aug 20, 2023
cb4196e
Update README.md
GuyPerets106 Aug 21, 2023
06507ed
Small fixes before merge
GuyPerets106 Aug 31, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Updated NerlMonitor directory as rebar3 app
GuyPerets106 committed Aug 3, 2023
commit afb9e94e57a36f5ac1d13cae91f889fbb58b0b78
20 changes: 20 additions & 0 deletions src_erl/NerlMonitor/.gitignore
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.rebar3
_build
_checkouts
_vendor
.eunit
*.o
*.beam
*.plt
*.swp
*.swo
.erlang.cookie
ebin
log
erl_crash.dump
.rebar
logs
.idea
*.iml
rebar3.crashdump
*~
2 changes: 0 additions & 2 deletions src_erl/NerlMonitor/Instructions.txt

This file was deleted.

186 changes: 186 additions & 0 deletions src_erl/NerlMonitor/LICENSE.md
GuyPerets106 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
# Apache License
Version 2.0, January 2004

http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

## 1. Definitions.

"License" shall mean the terms and conditions for use, reproduction, and
distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by the copyright
owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all other entities
that control, are controlled by, or are under common control with that entity.
For the purposes of this definition, "control" means (i) the power, direct or
indirect, to cause the direction or management of such entity, whether by
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity exercising
permissions granted by this License.

"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.

"Object" form shall mean any form resulting from mechanical transformation or
translation of a Source form, including but not limited to compiled object code,
generated documentation, and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or Object form, made
available under the License, as indicated by a copyright notice that is included
in or attached to the work (an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object form, that
is based on (or derived from) the Work and for which the editorial revisions,
annotations, elaborations, or other modifications represent, as a whole, an
original work of authorship. For the purposes of this License, Derivative Works
shall not include works that remain separable from, or merely link (or bind by
name) to the interfaces of, the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including the original version
of the Work and any modifications or additions to that Work or Derivative Works
thereof, that is intentionally submitted to Licensor for inclusion in the Work
by the copyright owner or by an individual or Legal Entity authorized to submit
on behalf of the copyright owner. For the purposes of this definition,
"submitted" means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems, and
issue tracking systems that are managed by, or on behalf of, the Licensor for
the purpose of discussing and improving the Work, but excluding communication
that is conspicuously marked or otherwise designated in writing by the copyright
owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
of whom a Contribution has been received by Licensor and subsequently
incorporated within the Work.

## 2. Grant of Copyright License.

Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the Work and such
Derivative Works in Source or Object form.

## 3. Grant of Patent License.

Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable (except as stated in this section) patent license to make, have
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
such license applies only to those patent claims licensable by such Contributor
that are necessarily infringed by their Contribution(s) alone or by combination
of their Contribution(s) with the Work to which such Contribution(s) was
submitted. If You institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
Contribution incorporated within the Work constitutes direct or contributory
patent infringement, then any patent licenses granted to You under this License
for that Work shall terminate as of the date such litigation is filed.

## 4. Redistribution.

You may reproduce and distribute copies of the Work or Derivative Works thereof
in any medium, with or without modifications, and in Source or Object form,
provided that You meet the following conditions:

1. You must give any other recipients of the Work or Derivative Works a copy of
this License; and

2. You must cause any modified files to carry prominent notices stating that
You changed the files; and

3. You must retain, in the Source form of any Derivative Works that You
distribute, all copyright, patent, trademark, and attribution notices from
the Source form of the Work, excluding those notices that do not pertain to
any part of the Derivative Works; and

4. If the Work includes a "NOTICE" text file as part of its distribution, then
any Derivative Works that You distribute must include a readable copy of the
attribution notices contained within such NOTICE file, excluding those
notices that do not pertain to any part of the Derivative Works, in at least
one of the following places: within a NOTICE text file distributed as part
of the Derivative Works; within the Source form or documentation, if
provided along with the Derivative Works; or, within a display generated by
the Derivative Works, if and wherever such third-party notices normally
appear. The contents of the NOTICE file are for informational purposes only
and do not modify the License. You may add Your own attribution notices
within Derivative Works that You distribute, alongside or as an addendum to
the NOTICE text from the Work, provided that such additional attribution
notices cannot be construed as modifying the License.

You may add Your own copyright statement to Your modifications and may provide
additional or different license terms and conditions for use, reproduction, or
distribution of Your modifications, or for any such Derivative Works as a whole,
provided Your use, reproduction, and distribution of the Work otherwise complies
with the conditions stated in this License.

## 5. Submission of Contributions.

Unless You explicitly state otherwise, any Contribution intentionally submitted
for inclusion in the Work by You to the Licensor shall be under the terms and
conditions of this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify the terms of
any separate license agreement you may have executed with Licensor regarding
such Contributions.

## 6. Trademarks.

This License does not grant permission to use the trade names, trademarks,
service marks, or product names of the Licensor, except as required for
reasonable and customary use in describing the origin of the Work and
reproducing the content of the NOTICE file.

## 7. Disclaimer of Warranty.

Unless required by applicable law or agreed to in writing, Licensor provides the
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
including, without limitation, any warranties or conditions of TITLE, NON-
INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
solely responsible for determining the appropriateness of using or
redistributing the Work and assume any risks associated with Your exercise of
permissions under this License.

## 8. Limitation of Liability.

In no event and under no legal theory, whether in tort (including negligence),
contract, or otherwise, unless required by applicable law (such as deliberate
and grossly negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special, incidental,
or consequential damages of any character arising as a result of this License or
out of the use or inability to use the Work (including but not limited to
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
any and all other commercial damages or losses), even if such Contributor has
been advised of the possibility of such damages.

## 9. Accepting Warranty or Additional Liability.

While redistributing the Work or Derivative Works thereof, You may choose to
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
other liability obligations and/or rights consistent with this License. However,
in accepting such obligations, You may act only on Your own behalf and on Your
sole responsibility, not on behalf of any other Contributor, and only if You
agree to indemnify, defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason of your
accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

Copyright 2023, GuyPerets106 <guyperets106@gmail.com>.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
9 changes: 9 additions & 0 deletions src_erl/NerlMonitor/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
NerlMonitor
=====

An OTP application

Build
-----

$ rebar3 compile
9 changes: 9 additions & 0 deletions src_erl/NerlMonitor/rebar.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{erl_opts, [debug_info]}.
{deps, [
{cowboy, {git, "https://github.com/ninenines/cowboy.git" , {tag,"2.9.0"}}}
]}.

{shell, [
% {config, "config/sys.config"},
{apps, [nerlMonitor]}
]}.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-module(hello_handler).
-module(nerlMonitor_handler).

-export([init/2]).

15 changes: 15 additions & 0 deletions src_erl/NerlMonitor/src/nerlMonitor.app.src
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{application, nerlMonitor,
[{description, "An OTP application"},
{vsn, "0.1.0"},
{registered, []},
{mod, {nerlMonitor_app, []}},
{applications,
[kernel,
stdlib
]},
{env,[]},
{modules, []},

{licenses, ["Apache-2.0"]},
{links, []}
]}.
Original file line number Diff line number Diff line change
@@ -7,10 +7,12 @@

-behaviour(application).

-include("../../Communication_Layer/http_Nerlserver/src/nerl_tools.hrl").

-export([start/2, stop/1]).

-define(UTILLNAME,nerlMonitor).
-define(IP , nerl_tools:getdeviceIP()).
-define(IP , "192.168.64.7").
-define(PORT,8096 ). %port place holder
-define(MSADDRES,"192.168.64.7:8080" ). %place holder
-define(GUI , {'PyrlangProcess' , 'py@127.0.0.1'}). % Erlang node should be long name to communicate with pyrlang node
@@ -33,7 +35,8 @@ start(_StartType, _StartArgs) ->


%ping main server in 0.5 sec intervals with connection request. will stop when got valid response.
mainServerPing(URL,Body)->
mainServerPing(URL,Body)->
io:format("pinging main server~n"),
Response = httpc:request(post,{URL, [],"application/x-www-form-urlencoded",Body}, [], []),
case Response of
{error,_}->
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%%%-------------------------------------------------------------------
%% @doc nerlGUI top level supervisor.
%% @doc NerlMonitor top level supervisor.
%% @end
%%%-------------------------------------------------------------------