Skip to content

Commit cb3e6b3

Browse files
brymon68brymon68
committed
Merge branch 'master' of baltig.sandia.gov:scot/SCOT
2 parents 2575067 + 6a7cfe0 commit cb3e6b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+62894
-2226
lines changed

‎bin/amq_queue_read_test.pl‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#!/usr/bin/env perl
2+
3+
use lib '../lib';
4+
use v5.18;
5+
6+
use strict;
7+
use warnings;
8+
9+
use AnyEvent::STOMP::Client;
10+
use Scot::Env;
11+
use JSON;
12+
use Data::Dumper;
13+
use DateTime;
14+
15+
16+
my $stomp = AnyEvent::STOMP::Client->new("localhost");
17+
18+
$stomp->connect();
19+
$stomp->on_connected(
20+
sub {
21+
my $stomp = shift;
22+
$stomp->subscribe('/queue/coe');
23+
}
24+
);
25+
26+
$stomp->on_error(
27+
sub {
28+
say "ERROR";
29+
say Dumper(\@_);
30+
}
31+
);
32+
33+
$stomp->on_message(
34+
sub {
35+
my ( $stomp, $header, $body ) = @_;
36+
37+
my $json = decode_json $body;
38+
39+
my $dt = DateTime->now();
40+
41+
my $date = $dt->ymd . " ". $dt->hms;
42+
my $dl = length($date);
43+
44+
my $nd = 80 - $dl - 10;
45+
46+
say "-"x10 . $dt->ymd . " ". $dt->hms. "-"x$nd;
47+
say Dumper($json);
48+
say "-"x80;
49+
}
50+
);
51+
say "===== Watching ActiveMQ =========";
52+
AnyEvent->condvar->recv;
53+
54+
55+

‎bin/amq_queue_send_test.pl‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/usr/bin/env perl
2+
use lib '../lib';
3+
use Data::Dumper;
4+
use JSON;
5+
use Net::STOMP::Client;
6+
use v5.18;
7+
8+
my $stomp = Net::STOMP::Client->new(
9+
host => '127.0.0.1',
10+
port => 61613,
11+
);
12+
$stomp->connect;
13+
14+
for my $i (1..10) {
15+
16+
my $href = {
17+
id => $i,
18+
type => "foo",
19+
data => {
20+
key1 => "value1",
21+
key2 => "value2",
22+
key3 => "value3",
23+
key4 => "value4",
24+
}
25+
};
26+
27+
my $json = encode_json $href;
28+
$stomp->send(
29+
destination => "/queue/coe",
30+
body => $json,
31+
);
32+
33+
sleep 1;
34+
}
35+
36+
$stomp->disconnect;

‎lib/Scot/App/Mail.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ sub post_alertgroup {
539539

540540
foreach my $ag (@agobjs) {
541541

542-
$self->env->mq->send("scot", {
542+
$self->env->mq->send("/topic/scot", {
543543
action => "created",
544544
data => {
545545
type => "alertgroup",

‎lib/Scot/App/Responder/Flair.pm‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ sub update_alertgroup {
160160
my $agcol = $mongo->collection("Alertgroup");
161161
$agcol->update_alertgroup_with_bundled_alert($putdata);
162162
$log->debug("after alertgroup update");
163-
$self->env->mq->send("scot", {
163+
$self->env->mq->send("/topic/scot", {
164164
action => "updated",
165165
data => {
166166
type => "alertgroup",
@@ -433,7 +433,7 @@ sub update_entry {
433433
$update_aref) = $ecol->update_entities($obj, $entity_aref);
434434
$log->debug("created entities: ",join(',',@$create_aref));
435435
foreach my $id (@$create_aref) {
436-
$self->env->mq->send("scot", {
436+
$self->env->mq->send("/topic/scot", {
437437
action => "created",
438438
data => {
439439
type => "entity",
@@ -445,7 +445,7 @@ sub update_entry {
445445
$self->put_stat("entity created", scalar(@$create_aref));
446446
$log->debug("updated entities: ",join(',',@$update_aref));
447447
foreach my $id (@$update_aref) {
448-
$self->env->mq->send("scot", {
448+
$self->env->mq->send("/topic/scot", {
449449
action => "updated",
450450
data => {
451451
type => "entity",
@@ -461,7 +461,7 @@ sub update_entry {
461461
}
462462
}
463463

464-
$self->env->mq->send("scot", {
464+
$self->env->mq->send("/topic/scot", {
465465
action => "updated",
466466
data => {
467467
type => "entry",

‎lib/Scot/App/Responder/Reflair.pm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,9 @@ sub send_message {
113113
};
114114

115115
$log->debug("Sending Notification: ", {filter=>\&Dumper, value=>$msg});
116-
$mq->send("scot", $msg);
116+
$mq->send("/topic/scot", $msg);
117+
118+
# TODO: SEND HREF to sharing queue
117119
}
118120

119121
sub parse_results {

‎lib/Scot/Collection/Alertgroup.pm‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,15 +198,6 @@ sub refresh_data {
198198
}
199199
});
200200

201-
# $log->trace("[Alertgroup $id] sending activemq update message");
202-
# $env->mq->send("scot", {
203-
# action => "updated",
204-
# data => {
205-
# type => "alertgroup",
206-
# id => $id,
207-
# who => $user
208-
# }
209-
# });
210201
}
211202

212203
sub api_subthing {

‎lib/Scot/Collection/Entry.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ sub create_from_promoted_alert {
3939
my $agobj = $agcol->find_iid($alert->alertgroup+0);
4040
my $subject = $agobj->subject;
4141
$json->{body} =
42-
qq|<h3>From Alert <a href="/#/alert/$id">$id</h3><br>|.
42+
qq|<h3>From Alert <a href="/#/alert/$id">$id</a></h3><br>|.
4343
qq|<h4>|.$subject.qq|</h4>|.
4444
$self->build_table($alert);
4545
$log->debug("Using : ",{filter=>\&Dumper, value => $json});

‎lib/Scot/Controller/Api.pm‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ sub create {
9191
if ( ref($object) eq "Scot::Model::Entry" ) {
9292
$data->{target} = $object->target;
9393
}
94-
$self->env->mq->send("scot",{
94+
$self->env->mq->send("/topic/scot",{
9595
action => "created",
9696
data => $data,
9797
});
@@ -142,7 +142,7 @@ sub post_create_process {
142142

143143
if ( ref($object) eq "Scot::Model::Sigbody" ) {
144144
$json->{revision} = $object->revision;
145-
$self->env->mq->send("scot", {
145+
$self->env->mq->send("/topic/scot", {
146146
action => "updated",
147147
data => {
148148
who => $self->session('user'),
@@ -542,7 +542,9 @@ sub refresh_entity_enrichments {
542542
my ($updated, $data) = $self->env->enrichments->enrich($entity);
543543

544544
if ( $updated > 0 ) {
545-
$entity->update_set(data => $data);
545+
foreach my $key (keys %$data) {
546+
$entity->update_set("data.$key" => $data->{$key});
547+
}
546548
}
547549
else {
548550
$self->env->log->debug('No entity updates');
@@ -928,7 +930,7 @@ sub promote {
928930
$mongo->collection('Alertgroup')->refresh_data($object->alertgroup);
929931
my $entry = $mongo->collection('Entry')
930932
->create_from_promoted_alert($object, $promotion_obj);
931-
$self->env->mq->send("scot",{
933+
$self->env->mq->send("/topic/scot",{
932934
action => "created",
933935
data => {
934936
who => $req->{user},
@@ -952,7 +954,7 @@ sub promote {
952954
});
953955

954956
# update mq and other bookkeeping
955-
$env->mq->send("scot", {
957+
$env->mq->send("/topic/scot", {
956958
action => "created",
957959
data => {
958960
who => $user,
@@ -963,7 +965,7 @@ sub promote {
963965
my $type = $object->get_collection_name;
964966
my $id = $object->id;
965967
if ( $type eq "alert" ) {
966-
$env->mq->send("scot", {
968+
$env->mq->send("/topic/scot", {
967969
action => "updated",
968970
data => {
969971
who => $user,
@@ -974,7 +976,7 @@ sub promote {
974976
});
975977
}
976978
else {
977-
$env->mq->send("scot", {
979+
$env->mq->send("/topic/scot", {
978980
action => "updated",
979981
data => {
980982
who => $user,
@@ -1025,7 +1027,7 @@ sub update_alerts {
10251027
my $status = $col->update_alerts_in_alertgroup($object, $req);
10261028
if ( scalar(@{$status->{updated}}) > 0 ) {
10271029
foreach my $aid (@{$status->{updated}}) {
1028-
$self->env->mq->send("scot",{
1030+
$self->env->mq->send("/topic/scot",{
10291031
action => "updated",
10301032
data => {
10311033
who => $self->session('user'),
@@ -1131,7 +1133,7 @@ sub post_update_process {
11311133
data => $mqdata,
11321134
};
11331135

1134-
$env->mq->send("scot", $mq_msg);
1136+
$env->mq->send("/topic/scot", $mq_msg);
11351137

11361138
if ( ref($object) eq "Scot::Model::Entry" ) {
11371139
$mq_msg->{data} = {
@@ -1140,7 +1142,7 @@ sub post_update_process {
11401142
id => $object->target->{id}, },
11411143
what => "Entry update",
11421144
};
1143-
$env->mq->send("scot", $mq_msg);
1145+
$env->mq->send("/topic/scot", $mq_msg);
11441146
$self->add_history("updated entry ".$object->id, $object);
11451147
}
11461148

@@ -1151,7 +1153,7 @@ sub post_update_process {
11511153
id => $object->{signature_id},
11521154
what => "Signature Update",
11531155
};
1154-
$env->mq->send("scot", $mq_msg);
1156+
$env->mq->send("/topic/scot", $mq_msg);
11551157
}
11561158
$env->mongo->collection('Stat')->put_stat("$colname updated", 1);
11571159
}
@@ -1451,7 +1453,7 @@ sub post_delete_process {
14511453
object => $object,
14521454
who => $self->session('user'),
14531455
};
1454-
$self->env->mq->send("scot",{
1456+
$self->env->mq->send("/topic/scot",{
14551457
action => "deleted",
14561458
data => $mqdata,
14571459
});
@@ -1506,7 +1508,7 @@ sub mq_obj_update {
15061508
my $target = shift;
15071509
my $mq = $self->env->mq;
15081510

1509-
$mq->send("scot", {
1511+
$mq->send("/topic/scot", {
15101512
action => "updated",
15111513
data => {
15121514
who => $self->session('user'),
@@ -1741,7 +1743,7 @@ sub do_command {
17411743
my $req_href = $self->get_request_params;
17421744

17431745
# TODO
1744-
$env->mq->send("scot", {
1746+
$env->mq->send("/topic/scot", {
17451747
action => "message",
17461748
data => {
17471749
wall => ""
@@ -1758,7 +1760,7 @@ sub wall {
17581760
my $msg = $self->param('msg');
17591761
my $now = $env->now;
17601762

1761-
$env->mq->send("scot", {
1763+
$env->mq->send("/topic/scot", {
17621764
action => "wall",
17631765
data => {
17641766
message => $msg,
@@ -1922,7 +1924,7 @@ sub undelete {
19221924
if ( ref($restored) eq "Scot::Model::Entry" ) {
19231925
$data->{target} = $restored->target;
19241926
}
1925-
$self->env->mq->send("scot",{
1927+
$self->env->mq->send("/topic/scot",{
19261928
action => "created",
19271929
data => $data,
19281930
});

‎lib/Scot/Controller/File.pm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ sub create_file_upload_entry {
189189
$parent_id,
190190
$target_type,
191191
$target_id);
192-
$env->mq->send("scot", {
192+
$env->mq->send("/topic/scot", {
193193
action => "created",
194194
data => {
195195
type => "entry",
@@ -198,7 +198,7 @@ sub create_file_upload_entry {
198198
what => "file_uploaded",
199199
}
200200
});
201-
$env->mq->send("scot", {
201+
$env->mq->send("/topic/scot", {
202202
action => "updated",
203203
data => {
204204
type => $target_type,

‎lib/Scot/Controller/Metric.pm‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -673,12 +673,19 @@ sub get_status {
673673
my $mongo = $env->mongo;
674674
my $log = $env->log;
675675

676-
my $status = {
677-
'Scot Flair Daemon' => $self->get_daemon_status('scfd'),
678-
'Scot Elastic Push Daemon' => $self->get_daemon_status('scepd'),
679-
'System Uptime' => `uptime`,
680-
'MongoDB' => $self->get_daemon_status('mongod'),
681-
};
676+
#my $status = {
677+
# 'Scot Flair Daemon' => $self->get_daemon_status('scfd'),
678+
# 'Scot Elastic Push Daemon' => $self->get_daemon_status('scepd'),
679+
# 'System Uptime' => `uptime`,
680+
# 'MongoDB' => $self->get_daemon_status('mongod'),
681+
#};
682+
my $status = [
683+
{ name => "Scot Flair", status => $self->get_daemon_status('scfd') },
684+
{ name => "Scot Elastic", status => $self->get_daemon_status('scepd') },
685+
{ name => "Scot App", status => $self->get_daemon_status('scfd') },
686+
{ name => "Scot Reflair", status => $self->get_daemon_status('scrfd') },
687+
{ name => "Scot Mongodb", status => $self->get_daemon_status('mongod') },
688+
];
682689
$self->do_render($status);
683690
}
684691

@@ -698,9 +705,12 @@ sub get_daemon_status {
698705
my ($type, $data) = split(/: /,$line);
699706
if ( $type =~ /Active/ ) {
700707
push @statuses, $data;
701-
}
702-
if ( $type =~ /Main PID/ ) {
703-
push @statuses, $data;
708+
if ( $data =~ /running/i ) {
709+
return "ok";
710+
}
711+
if ( $data =~ /dead/i ) {
712+
return "error";
713+
}
704714
}
705715
}
706716
return join(' ',reverse @statuses);

0 commit comments

Comments
 (0)