diff --git a/station/config.py b/station/config.py index d4600a0..a713fb4 100644 --- a/station/config.py +++ b/station/config.py @@ -1,4 +1,4 @@ masterUrl = "http://10.0.0.8" -apiKey = "2c4d64c8-e73c-4111-8e71-40097c7318ef" +apiKey = "5b20d5f4-11ce-4125-86fb-601e66143388" pullInterval = 120 # in sec planInterval = 1200 # in sec \ No newline at end of file diff --git a/station/main.py b/station/main.py index 831b21f..f7d4e26 100644 --- a/station/main.py +++ b/station/main.py @@ -47,4 +47,20 @@ while True: except Exception as inst: print(f"[ERROR] main script fail restarting - error {inst}") + # Get current system exception + ex_type, ex_value, ex_traceback = sys.exc_info() + + # Extract unformatter stack traces as tuples + trace_back = traceback.extract_tb(ex_traceback) + + # Format stacktrace + stack_trace = list() + + for trace in trace_back: + stack_trace.append("File : %s , Line : %d, Func.Name : %s, Message : %s" % (trace[0], trace[1], trace[2], trace[3])) + + print("Exception type : %s " % ex_type.__name__) + print("Exception message : %s" %ex_value) + print("Stack trace : %s" %stack_trace) + time.sleep(1) \ No newline at end of file diff --git a/station/planner.py b/station/planner.py index 554bc34..31f6839 100644 --- a/station/planner.py +++ b/station/planner.py @@ -41,6 +41,8 @@ def plan(lat, lon, alt, tle, transmitter, receiver, priority, name, delta = time "priority": priority }) + return plans + def planAll(location): planeble = puller.getPlaneble() plans = [] @@ -53,7 +55,7 @@ def planAll(location): transmitter["locator"]["tle"], transmitter["transmitter"], transmitter["receiver"], - transmitter["priority"] + transmitter["priority"], transmitter["name"] ) @@ -61,11 +63,11 @@ def planAll(location): i = 0 while i + 1 < len(plans): - if plan[i]["end"] < plan[i + 1]["start"]: - puller.plan(plan[i]["transmitter"], plan[i]["receiver"], plan[i]["start"], plan[i]["end"]) + if plans[i]["end"] < plans[i + 1]["start"]: + puller.plan(plans[i]["transmitter"], plans[i]["receiver"], plans[i]["start"], plans[i]["end"]) i += 1 - elif plan[i]["priority"] > plan[i + 1]["priority"]: - plan.pop(i + 1) + elif plans[i]["priority"] > plans[i + 1]["priority"]: + plans.pop(i + 1) else: i += 1 \ No newline at end of file diff --git a/station/recorder.py b/station/recorder.py index bcc38cb..853e958 100644 --- a/station/recorder.py +++ b/station/recorder.py @@ -59,16 +59,15 @@ class recorder(threading.Thread): puller.setDecoding(self.job["id"]) - pipe = " && ".join(self.job["proccessPipe"]) - #create artecats dir adir = f"artefacts/{self.job['id']}" os.makedirs(adir) - #ok now replace - pipe = pipe.replace("{baseband}", str(baseband) + ".s8").replace("{fs}", str(fs)).replace("{artefactDir}", str(adir)) + for pipe in self.job["proccessPipe"]: + #ok now replace + pipe = pipe.replace("{baseband}", str(baseband) + ".s8").replace("{fs}", str(fs)).replace("{artefactDir}", str(adir)).replace("{freq}", str(self.job['transmitter']['centerFrequency'])) - os.system(pipe) + os.system(pipe) puller.setSuccess(self.job["id"]) diff --git a/web/ARTEFACTS/.gitkeep b/web/ARTEFACTS/.gitkeep old mode 100644 new mode 100755 diff --git a/web/DB/.gitkeep b/web/DB/.gitkeep old mode 100644 new mode 100755 diff --git a/web/seeds.php b/web/seeds.php index 56fafe7..b28382b 100644 --- a/web/seeds.php +++ b/web/seeds.php @@ -12,9 +12,13 @@ $satType->name->set("sat"); $satType->commit(); - $wetImgType = new \DAL\dataType(); - $wetImgType->name->set("AVHRR"); - $wetImgType->commit(); + $avhrrType = new \DAL\dataType(); + $avhrrType->name->set("AVHRR"); + $avhrrType->commit(); + + $msumrType = new \DAL\dataType(); + $msumrType->name->set("MSU-MR"); + $msumrType->commit(); /** * Antennas seeds @@ -101,12 +105,11 @@ /** * Process pipes */ - $aptPipe = new \DAL\processPipe(); $aptPipe->name->set("NOAA APT"); $aptPipe->pipe->set([ "satdump noaa_apt baseband {baseband} {artefactDir} --samplerate {fs} --baseband_format s8", - "cp {baseband} {artefactDir}" + "cp {baseband} {artefactDir}/{freq}_{fs}.s8" ]); $aptPipe->commit(); @@ -115,7 +118,7 @@ $lrptPipe->name->set("METEOR LRPT"); $lrptPipe->pipe->set([ "satdump meteor_m2-x_lrpt baseband {baseband} {artefactDir} --samplerate {fs} --baseband_format s8", - "cp {baseband} {artefactDir}" + "cp {baseband} {artefactDir}/{freq}_{fs}.s8" ]); $lrptPipe->commit(); @@ -138,7 +141,7 @@ $noaa19APT = new \DAL\transmitter(); $noaa19APT->target->set($noaa19); - $noaa19APT->dataType->set($wetImgType); + $noaa19APT->dataType->set($avhrrType); $noaa19APT->bandwidth->set(34000); $noaa19APT->centerFrequency->set(137100000); $noaa19APT->modulation->set($apt); @@ -149,7 +152,7 @@ $noaa19DSB = new \DAL\transmitter(); $noaa19DSB->target->set($noaa19); - $noaa19DSB->dataType->set($wetImgType); + $noaa19DSB->dataType->set($avhrrType); $noaa19DSB->bandwidth->set(34000); $noaa19DSB->centerFrequency->set(137770000); $noaa19DSB->modulation->set($dsb); @@ -158,7 +161,7 @@ $noaa19HRPT = new \DAL\transmitter(); $noaa19HRPT->target->set($noaa19); - $noaa19HRPT->dataType->set($wetImgType); + $noaa19HRPT->dataType->set($avhrrType); $noaa19HRPT->bandwidth->set(3000000); $noaa19HRPT->centerFrequency->set(1698000000); $noaa19HRPT->modulation->set($hrpt); @@ -182,7 +185,7 @@ $noaa18APT = new \DAL\transmitter(); $noaa18APT->target->set($noaa18); - $noaa18APT->dataType->set($wetImgType); + $noaa18APT->dataType->set($avhrrType); $noaa18APT->bandwidth->set(34000); $noaa18APT->centerFrequency->set(137912500); $noaa18APT->modulation->set($apt); @@ -193,7 +196,7 @@ $noaa18DSB = new \DAL\transmitter(); $noaa18DSB->target->set($noaa18); - $noaa18DSB->dataType->set($wetImgType); + $noaa18DSB->dataType->set($avhrrType); $noaa18DSB->bandwidth->set(34000); $noaa18DSB->centerFrequency->set(137350000); $noaa18DSB->modulation->set($dsb); @@ -202,7 +205,7 @@ $noaa18HRPT = new \DAL\transmitter(); $noaa18HRPT->target->set($noaa18); - $noaa18HRPT->dataType->set($wetImgType); + $noaa18HRPT->dataType->set($avhrrType); $noaa18HRPT->bandwidth->set(3000000); $noaa18HRPT->centerFrequency->set(1707000000); $noaa18HRPT->modulation->set($hrpt); @@ -226,7 +229,7 @@ $noaa15APT = new \DAL\transmitter(); $noaa15APT->target->set($noaa15); - $noaa15APT->dataType->set($wetImgType); + $noaa15APT->dataType->set($avhrrType); $noaa15APT->bandwidth->set(34000); $noaa15APT->centerFrequency->set(137500000); $noaa15APT->modulation->set($apt); @@ -237,7 +240,7 @@ $noaa15DSB = new \DAL\transmitter(); $noaa15DSB->target->set($noaa15); - $noaa15DSB->dataType->set($wetImgType); + $noaa15DSB->dataType->set($avhrrType); $noaa15DSB->bandwidth->set(34000); $noaa15DSB->centerFrequency->set(1377700000); $noaa15DSB->modulation->set($dsb); @@ -246,7 +249,7 @@ $noaa15HRPT = new \DAL\transmitter(); $noaa15HRPT->target->set($noaa15); - $noaa15HRPT->dataType->set($wetImgType); + $noaa15HRPT->dataType->set($avhrrType); $noaa15HRPT->bandwidth->set(3000000); $noaa15HRPT->centerFrequency->set(1702500000); $noaa15HRPT->modulation->set($hrpt); @@ -267,7 +270,7 @@ $meteor23LRPT1 = new \DAL\transmitter(); $meteor23LRPT1->target->set($meteor23); - $meteor23LRPT1->dataType->set($wetImgType); + $meteor23LRPT1->dataType->set($msumrType); $meteor23LRPT1->bandwidth->set(120000); $meteor23LRPT1->centerFrequency->set(137900000); $meteor23LRPT1->modulation->set($lrpt); @@ -278,7 +281,7 @@ $meteor23LRPT2 = new \DAL\transmitter(); $meteor23LRPT2->target->set($meteor23); - $meteor23LRPT2->dataType->set($wetImgType); + $meteor23LRPT2->dataType->set($msumrType); $meteor23LRPT2->bandwidth->set(120000); $meteor23LRPT2->centerFrequency->set(137100000); $meteor23LRPT2->modulation->set($lrpt); @@ -288,7 +291,7 @@ $meteor23HRPT = new \DAL\transmitter(); $meteor23HRPT->target->set($meteor23); - $meteor23HRPT->dataType->set($wetImgType); + $meteor23HRPT->dataType->set($msumrType); $meteor23HRPT->bandwidth->set(3000000); $meteor23HRPT->centerFrequency->set(1700000000); $meteor23HRPT->modulation->set($hrpt); diff --git a/web/wsos b/web/wsos index 1b376bf..f57c01b 160000 --- a/web/wsos +++ b/web/wsos @@ -1 +1 @@ -Subproject commit 1b376bf6467101a1f3262f74d23118e2b19bd3ba +Subproject commit f57c01b034921d5758781d9687a98b238a9330f1