From 1b68d5a89abdd8a7db4d4762a3ee44c3363e9a74 Mon Sep 17 00:00:00 2001 From: bob Date: Wed, 8 Jan 2020 12:19:28 -0500 Subject: cleaned up searchBox. fixed parentdocument context menu placement. --- .../solr/dash/data/tlog/tlog.0000000000000000011 | Bin 0 -> 1291205 bytes .../solr/dash/data/tlog/tlog.0000000000000000012 | Bin 0 -> 196943 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000011 create mode 100644 solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 (limited to 'solr-8.3.1/server/solr/dash/data/tlog') diff --git a/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000011 b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000011 new file mode 100644 index 000000000..12ce36e19 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000011 differ diff --git a/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 new file mode 100644 index 000000000..c2322ffbe Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 differ -- cgit v1.2.3-70-g09d2 From e08598d32fdfdcbd12532facf05b7119bd780a19 Mon Sep 17 00:00:00 2001 From: Sam Wilkins Date: Wed, 8 Jan 2020 12:31:01 -0500 Subject: solr manager fixes, regex --- solr-8.3.1/server/solr/dash/data/index/_hs_1.liv | Bin 187 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_hs_2.liv | Bin 0 -> 187 bytes solr-8.3.1/server/solr/dash/data/index/_j7_1.liv | Bin 75 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_j7_2.liv | Bin 0 -> 75 bytes solr-8.3.1/server/solr/dash/data/index/_jo.dii | Bin 72 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jo.dim | Bin 218 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jo.fdt | Bin 651 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jo.fdx | Bin 84 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jo.fnm | Bin 2347 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jo.nvd | Bin 353 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jo.nvm | Bin 643 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jo.si | Bin 531 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jo_1.liv | Bin 67 -> 0 bytes .../server/solr/dash/data/index/_jo_Lucene50_0.doc | Bin 2526 -> 0 bytes .../server/solr/dash/data/index/_jo_Lucene50_0.pos | Bin 2723 -> 0 bytes .../server/solr/dash/data/index/_jo_Lucene50_0.tim | Bin 9422 -> 0 bytes .../server/solr/dash/data/index/_jo_Lucene50_0.tip | Bin 657 -> 0 bytes .../server/solr/dash/data/index/_jo_Lucene80_0.dvd | Bin 205 -> 0 bytes .../server/solr/dash/data/index/_jo_Lucene80_0.dvm | Bin 249 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jp.dii | Bin 72 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jp.dim | Bin 229 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jp.fdt | Bin 398 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jp.fdx | Bin 84 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jp.fnm | Bin 1081 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jp.nvd | Bin 235 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jp.nvm | Bin 355 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jp.si | Bin 531 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jp_1.liv | Bin 67 -> 0 bytes .../server/solr/dash/data/index/_jp_Lucene50_0.doc | Bin 2635 -> 0 bytes .../server/solr/dash/data/index/_jp_Lucene50_0.pos | Bin 2579 -> 0 bytes .../server/solr/dash/data/index/_jp_Lucene50_0.tim | Bin 3558 -> 0 bytes .../server/solr/dash/data/index/_jp_Lucene50_0.tip | Bin 304 -> 0 bytes .../server/solr/dash/data/index/_jp_Lucene80_0.dvd | Bin 121 -> 0 bytes .../server/solr/dash/data/index/_jp_Lucene80_0.dvm | Bin 249 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jq.dii | Bin 78 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jq.dim | Bin 291 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jq.fdt | Bin 719 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jq.fdx | Bin 84 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jq.fnm | Bin 1282 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jq.nvd | Bin 131 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jq.nvm | Bin 283 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jq.si | Bin 531 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jq_2.liv | Bin 67 -> 0 bytes .../server/solr/dash/data/index/_jq_Lucene50_0.doc | Bin 116 -> 0 bytes .../server/solr/dash/data/index/_jq_Lucene50_0.pos | Bin 458 -> 0 bytes .../server/solr/dash/data/index/_jq_Lucene50_0.tim | Bin 5813 -> 0 bytes .../server/solr/dash/data/index/_jq_Lucene50_0.tip | Bin 366 -> 0 bytes .../server/solr/dash/data/index/_jq_Lucene80_0.dvd | Bin 190 -> 0 bytes .../server/solr/dash/data/index/_jq_Lucene80_0.dvm | Bin 249 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jr.dii | Bin 69 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jr.dim | Bin 124 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jr.fdt | Bin 226 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jr.fdx | Bin 84 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jr.fnm | Bin 445 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jr.si | Bin 496 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_jr_1.liv | Bin 67 -> 0 bytes .../server/solr/dash/data/index/_jr_Lucene50_0.doc | Bin 114 -> 0 bytes .../server/solr/dash/data/index/_jr_Lucene50_0.tim | Bin 520 -> 0 bytes .../server/solr/dash/data/index/_jr_Lucene50_0.tip | Bin 145 -> 0 bytes .../server/solr/dash/data/index/_jr_Lucene80_0.dvd | Bin 110 -> 0 bytes .../server/solr/dash/data/index/_jr_Lucene80_0.dvm | Bin 249 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/_js.dii | Bin 0 -> 110 bytes solr-8.3.1/server/solr/dash/data/index/_js.dim | Bin 0 -> 9025 bytes solr-8.3.1/server/solr/dash/data/index/_js.fdt | Bin 0 -> 40992 bytes solr-8.3.1/server/solr/dash/data/index/_js.fdx | Bin 0 -> 103 bytes solr-8.3.1/server/solr/dash/data/index/_js.fnm | Bin 0 -> 5723 bytes solr-8.3.1/server/solr/dash/data/index/_js.nvd | Bin 0 -> 4794 bytes solr-8.3.1/server/solr/dash/data/index/_js.nvm | Bin 0 -> 1471 bytes solr-8.3.1/server/solr/dash/data/index/_js.si | Bin 0 -> 533 bytes solr-8.3.1/server/solr/dash/data/index/_js_1.liv | Bin 0 -> 131 bytes .../server/solr/dash/data/index/_js_Lucene50_0.doc | Bin 0 -> 270044 bytes .../server/solr/dash/data/index/_js_Lucene50_0.pos | Bin 0 -> 318551 bytes .../server/solr/dash/data/index/_js_Lucene50_0.tim | Bin 0 -> 423689 bytes .../server/solr/dash/data/index/_js_Lucene50_0.tip | Bin 0 -> 11737 bytes .../server/solr/dash/data/index/_js_Lucene80_0.dvd | Bin 0 -> 2396 bytes .../server/solr/dash/data/index/_js_Lucene80_0.dvm | Bin 0 -> 249 bytes solr-8.3.1/server/solr/dash/data/index/segments_d | Bin 649 -> 0 bytes solr-8.3.1/server/solr/dash/data/index/segments_e | Bin 0 -> 451 bytes .../solr/dash/data/tlog/tlog.0000000000000000012 | Bin 196943 -> 196964 bytes .../tmp/start_5201032335657884982.properties | 11 +++++++++++ src/server/ApiManagers/SearchManager.ts | 2 +- src/server/DashSession.ts | 2 +- 82 files changed, 13 insertions(+), 2 deletions(-) delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_hs_1.liv create mode 100644 solr-8.3.1/server/solr/dash/data/index/_hs_2.liv delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_j7_1.liv create mode 100644 solr-8.3.1/server/solr/dash/data/index/_j7_2.liv delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo.dii delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo.dim delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo.fdt delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo.fdx delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo.fnm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo.nvd delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo.nvm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo.si delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo_1.liv delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.doc delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.pos delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tim delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tip delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvd delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp.dii delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp.dim delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp.fdt delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp.fdx delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp.fnm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp.nvd delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp.nvm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp.si delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp_1.liv delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.doc delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.pos delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tim delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tip delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvd delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq.dii delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq.dim delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq.fdt delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq.fdx delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq.fnm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq.nvd delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq.nvm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq.si delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq_2.liv delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.doc delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.pos delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tim delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tip delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvd delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr.dii delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr.dim delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr.fdt delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr.fdx delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr.fnm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr.si delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr_1.liv delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.doc delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tim delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tip delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvd delete mode 100644 solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvm create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js.dii create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js.dim create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js.fdt create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js.fdx create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js.fnm create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js.nvd create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js.nvm create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js.si create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js_1.liv create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.doc create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.pos create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.tim create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.tip create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js_Lucene80_0.dvd create mode 100644 solr-8.3.1/server/solr/dash/data/index/_js_Lucene80_0.dvm delete mode 100644 solr-8.3.1/server/solr/dash/data/index/segments_d create mode 100644 solr-8.3.1/server/solr/dash/data/index/segments_e create mode 100644 solr-8.3.1/server/tmp/start_5201032335657884982.properties (limited to 'solr-8.3.1/server/solr/dash/data/tlog') diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs_1.liv b/solr-8.3.1/server/solr/dash/data/index/_hs_1.liv deleted file mode 100644 index 9e1e90cb8..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_hs_1.liv and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_hs_2.liv b/solr-8.3.1/server/solr/dash/data/index/_hs_2.liv new file mode 100644 index 000000000..d2a881ab8 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_hs_2.liv differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7_1.liv b/solr-8.3.1/server/solr/dash/data/index/_j7_1.liv deleted file mode 100644 index 65e825f18..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_j7_1.liv and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_j7_2.liv b/solr-8.3.1/server/solr/dash/data/index/_j7_2.liv new file mode 100644 index 000000000..e064804e4 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_j7_2.liv differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.dii b/solr-8.3.1/server/solr/dash/data/index/_jo.dii deleted file mode 100644 index d621dc010..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo.dii and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.dim b/solr-8.3.1/server/solr/dash/data/index/_jo.dim deleted file mode 100644 index a9d846c55..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo.dim and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.fdt b/solr-8.3.1/server/solr/dash/data/index/_jo.fdt deleted file mode 100644 index 69d7ce59c..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo.fdt and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.fdx b/solr-8.3.1/server/solr/dash/data/index/_jo.fdx deleted file mode 100644 index 71a73ac09..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo.fdx and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.fnm b/solr-8.3.1/server/solr/dash/data/index/_jo.fnm deleted file mode 100644 index b02414ef0..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo.fnm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.nvd b/solr-8.3.1/server/solr/dash/data/index/_jo.nvd deleted file mode 100644 index 993fa7ddc..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo.nvd and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.nvm b/solr-8.3.1/server/solr/dash/data/index/_jo.nvm deleted file mode 100644 index 4397e5533..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo.nvm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo.si b/solr-8.3.1/server/solr/dash/data/index/_jo.si deleted file mode 100644 index 2f0aefd63..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo.si and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_1.liv b/solr-8.3.1/server/solr/dash/data/index/_jo_1.liv deleted file mode 100644 index 46316505e..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo_1.liv and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.doc deleted file mode 100644 index 1cbf85053..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.doc and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.pos deleted file mode 100644 index 97206ebfa..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.pos and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tim deleted file mode 100644 index d06a85746..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tim and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tip deleted file mode 100644 index fd9ff3dae..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene50_0.tip and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvd deleted file mode 100644 index 602ba23e7..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvd and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvm deleted file mode 100644 index 1fd81041f..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jo_Lucene80_0.dvm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.dii b/solr-8.3.1/server/solr/dash/data/index/_jp.dii deleted file mode 100644 index c39beb1bd..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp.dii and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.dim b/solr-8.3.1/server/solr/dash/data/index/_jp.dim deleted file mode 100644 index 87a5071d7..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp.dim and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.fdt b/solr-8.3.1/server/solr/dash/data/index/_jp.fdt deleted file mode 100644 index a232efdf8..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp.fdt and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.fdx b/solr-8.3.1/server/solr/dash/data/index/_jp.fdx deleted file mode 100644 index 0b5e95a9a..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp.fdx and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.fnm b/solr-8.3.1/server/solr/dash/data/index/_jp.fnm deleted file mode 100644 index c09282147..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp.fnm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.nvd b/solr-8.3.1/server/solr/dash/data/index/_jp.nvd deleted file mode 100644 index 12dcf3d4d..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp.nvd and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.nvm b/solr-8.3.1/server/solr/dash/data/index/_jp.nvm deleted file mode 100644 index 4bde4b5f0..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp.nvm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp.si b/solr-8.3.1/server/solr/dash/data/index/_jp.si deleted file mode 100644 index 40cd02b98..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp.si and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_1.liv b/solr-8.3.1/server/solr/dash/data/index/_jp_1.liv deleted file mode 100644 index be94523f4..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp_1.liv and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.doc deleted file mode 100644 index 90774bb6f..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.doc and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.pos deleted file mode 100644 index b4814c1f7..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.pos and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tim deleted file mode 100644 index f8a7871e1..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tim and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tip deleted file mode 100644 index c29ac6ed5..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene50_0.tip and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvd deleted file mode 100644 index 41afd53b9..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvd and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvm deleted file mode 100644 index 527eed668..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jp_Lucene80_0.dvm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.dii b/solr-8.3.1/server/solr/dash/data/index/_jq.dii deleted file mode 100644 index a0a86dfd0..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq.dii and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.dim b/solr-8.3.1/server/solr/dash/data/index/_jq.dim deleted file mode 100644 index e69c06061..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq.dim and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.fdt b/solr-8.3.1/server/solr/dash/data/index/_jq.fdt deleted file mode 100644 index c49ed904f..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq.fdt and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.fdx b/solr-8.3.1/server/solr/dash/data/index/_jq.fdx deleted file mode 100644 index 85d62a39c..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq.fdx and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.fnm b/solr-8.3.1/server/solr/dash/data/index/_jq.fnm deleted file mode 100644 index b3aa23794..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq.fnm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.nvd b/solr-8.3.1/server/solr/dash/data/index/_jq.nvd deleted file mode 100644 index fb74de020..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq.nvd and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.nvm b/solr-8.3.1/server/solr/dash/data/index/_jq.nvm deleted file mode 100644 index b407b1b63..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq.nvm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq.si b/solr-8.3.1/server/solr/dash/data/index/_jq.si deleted file mode 100644 index cdf2673ca..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq.si and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_2.liv b/solr-8.3.1/server/solr/dash/data/index/_jq_2.liv deleted file mode 100644 index 0ae2a2dc3..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq_2.liv and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.doc deleted file mode 100644 index 91ae597e1..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.doc and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.pos deleted file mode 100644 index 047dd7ae9..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.pos and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tim deleted file mode 100644 index 352a6b592..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tim and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tip deleted file mode 100644 index ca0b2688d..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene50_0.tip and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvd deleted file mode 100644 index 7a5fbcef3..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvd and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvm deleted file mode 100644 index 228fc7b0a..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jq_Lucene80_0.dvm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.dii b/solr-8.3.1/server/solr/dash/data/index/_jr.dii deleted file mode 100644 index 7bec10455..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr.dii and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.dim b/solr-8.3.1/server/solr/dash/data/index/_jr.dim deleted file mode 100644 index cdf02c5fb..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr.dim and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.fdt b/solr-8.3.1/server/solr/dash/data/index/_jr.fdt deleted file mode 100644 index 183dda424..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr.fdt and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.fdx b/solr-8.3.1/server/solr/dash/data/index/_jr.fdx deleted file mode 100644 index 96942bc74..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr.fdx and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.fnm b/solr-8.3.1/server/solr/dash/data/index/_jr.fnm deleted file mode 100644 index 34731760f..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr.fnm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr.si b/solr-8.3.1/server/solr/dash/data/index/_jr.si deleted file mode 100644 index bc131eb25..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr.si and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_1.liv b/solr-8.3.1/server/solr/dash/data/index/_jr_1.liv deleted file mode 100644 index 22da1aa4f..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr_1.liv and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.doc deleted file mode 100644 index 94df5353c..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.doc and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tim deleted file mode 100644 index 2f078b0f1..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tim and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tip deleted file mode 100644 index b6239f17d..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene50_0.tip and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvd deleted file mode 100644 index 171be787e..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvd and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvm deleted file mode 100644 index f76033c91..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/_jr_Lucene80_0.dvm and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js.dii b/solr-8.3.1/server/solr/dash/data/index/_js.dii new file mode 100644 index 000000000..6456d0dda Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js.dii differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js.dim b/solr-8.3.1/server/solr/dash/data/index/_js.dim new file mode 100644 index 000000000..c52287cc3 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js.dim differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js.fdt b/solr-8.3.1/server/solr/dash/data/index/_js.fdt new file mode 100644 index 000000000..dd37842f2 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js.fdt differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js.fdx b/solr-8.3.1/server/solr/dash/data/index/_js.fdx new file mode 100644 index 000000000..9a09b0b33 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js.fdx differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js.fnm b/solr-8.3.1/server/solr/dash/data/index/_js.fnm new file mode 100644 index 000000000..0bbd5b508 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js.fnm differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js.nvd b/solr-8.3.1/server/solr/dash/data/index/_js.nvd new file mode 100644 index 000000000..cfba6605d Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js.nvd differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js.nvm b/solr-8.3.1/server/solr/dash/data/index/_js.nvm new file mode 100644 index 000000000..85d8c924e Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js.nvm differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js.si b/solr-8.3.1/server/solr/dash/data/index/_js.si new file mode 100644 index 000000000..45cc01db1 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js.si differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js_1.liv b/solr-8.3.1/server/solr/dash/data/index/_js_1.liv new file mode 100644 index 000000000..32ace65e0 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js_1.liv differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.doc b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.doc new file mode 100644 index 000000000..9ca1ec8bd Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.doc differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.pos b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.pos new file mode 100644 index 000000000..141b1fac1 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.pos differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.tim b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.tim new file mode 100644 index 000000000..5d36b0e8e Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.tim differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.tip b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.tip new file mode 100644 index 000000000..1f7c13c9c Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene50_0.tip differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js_Lucene80_0.dvd b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene80_0.dvd new file mode 100644 index 000000000..0ab5498b2 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene80_0.dvd differ diff --git a/solr-8.3.1/server/solr/dash/data/index/_js_Lucene80_0.dvm b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene80_0.dvm new file mode 100644 index 000000000..294b9d631 Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/_js_Lucene80_0.dvm differ diff --git a/solr-8.3.1/server/solr/dash/data/index/segments_d b/solr-8.3.1/server/solr/dash/data/index/segments_d deleted file mode 100644 index 1e98e2f77..000000000 Binary files a/solr-8.3.1/server/solr/dash/data/index/segments_d and /dev/null differ diff --git a/solr-8.3.1/server/solr/dash/data/index/segments_e b/solr-8.3.1/server/solr/dash/data/index/segments_e new file mode 100644 index 000000000..0c6b0903f Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/index/segments_e differ diff --git a/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 index c2322ffbe..ec2251d98 100644 Binary files a/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 and b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000012 differ diff --git a/solr-8.3.1/server/tmp/start_5201032335657884982.properties b/solr-8.3.1/server/tmp/start_5201032335657884982.properties new file mode 100644 index 000000000..e3a72dc76 --- /dev/null +++ b/solr-8.3.1/server/tmp/start_5201032335657884982.properties @@ -0,0 +1,11 @@ +#start.jar properties +#Wed Jan 08 17:27:07 UTC 2020 +java.version.platform=8 +java.version=1.8.0_131 +java.version.micro=0 +jetty.home=C\:\\Users\\avd\\Desktop\\Sam\\Dash-Web\\solr-8.3.1\\server +java.version.minor=8 +jetty.home.uri=file\:///C\:/Users/avd/Desktop/Sam/Dash-Web/solr-8.3.1/server +jetty.base=C\:\\Users\\avd\\Desktop\\Sam\\Dash-Web\\solr-8.3.1\\server +java.version.major=1 +jetty.base.uri=file\:///C\:/Users/avd/Desktop/Sam/Dash-Web/solr-8.3.1/server diff --git a/src/server/ApiManagers/SearchManager.ts b/src/server/ApiManagers/SearchManager.ts index c1c908088..cb30c9552 100644 --- a/src/server/ApiManagers/SearchManager.ts +++ b/src/server/ApiManagers/SearchManager.ts @@ -73,7 +73,7 @@ export namespace SolrManager { const args = status ? "start" : "stop -p 8983"; try { console.log(`Solr management: trying to ${args}`); - console.log(execSync(`./solr.cmd ${args}`, { cwd: "./solr-8.3.1/bin" })); + console.log(execSync(`${process.platform === "win32" ? "solr.cmd" : "solr"} ${args}`, { cwd: "./solr-8.3.1/bin" }).toString()); return true; } catch (e) { console.log(red(`Solr management error: unable to ${args}`)); diff --git a/src/server/DashSession.ts b/src/server/DashSession.ts index 22bcbadc9..83ce7caaf 100644 --- a/src/server/DashSession.ts +++ b/src/server/DashSession.ts @@ -49,7 +49,7 @@ export class DashSessionAgent extends Session.AppliedSessionAgent { } }); monitor.addReplCommand("pull", [], () => execSync("git pull", { stdio: ["ignore", "inherit", "inherit"] })); - monitor.addReplCommand("solr", [/start|stop/g], args => SolrManager.SetRunning(args[0] === "start")); + monitor.addReplCommand("solr", [/start|stop/], args => SolrManager.SetRunning(args[0] === "start")); return monitor; } -- cgit v1.2.3-70-g09d2 From d8361df45515c9724dcf0400a2d9484118b4cd71 Mon Sep 17 00:00:00 2001 From: Sam Wilkins Date: Wed, 8 Jan 2020 22:04:58 -0500 Subject: configuration assignment improvements, exec log and more granularity for identifiers --- session.config.json | 8 +- .../solr/dash/data/tlog/tlog.0000000000000000014 | Bin 0 -> 56466 bytes src/server/ApiManagers/SearchManager.ts | 16 +- src/server/DashSession.ts | 13 +- src/server/Session/session.ts | 201 ++++++++++++++------- src/server/Session/session_config_schema.ts | 72 +++++--- 6 files changed, 208 insertions(+), 102 deletions(-) create mode 100644 solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000014 (limited to 'solr-8.3.1/server/solr/dash/data/tlog') diff --git a/session.config.json b/session.config.json index 57ca9e3cc..f613dd904 100644 --- a/session.config.json +++ b/session.config.json @@ -4,7 +4,9 @@ "server": 1050, "socket": 4321 }, - "pollingRoute": "/serverHeartbeat", - "pollingIntervalSeconds": 15, - "pollingFailureTolerance": 0 + "polling": { + "route": "/serverHeartbeat", + "intervalSeconds": 15, + "failureTolerance": 0 + } } \ No newline at end of file diff --git a/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000014 b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000014 new file mode 100644 index 000000000..e39ac337f Binary files /dev/null and b/solr-8.3.1/server/solr/dash/data/tlog/tlog.0000000000000000014 differ diff --git a/src/server/ApiManagers/SearchManager.ts b/src/server/ApiManagers/SearchManager.ts index 316ba09ed..4ce12f9f3 100644 --- a/src/server/ApiManagers/SearchManager.ts +++ b/src/server/ApiManagers/SearchManager.ts @@ -8,6 +8,7 @@ import { red, cyan, yellow } from "colors"; import RouteSubscriber from "../RouteSubscriber"; import { exec } from "child_process"; import { onWindows } from ".."; +import { get } from "request-promise"; export class SearchManager extends ApiManager { @@ -68,18 +69,25 @@ export class SearchManager extends ApiManager { export namespace SolrManager { + const command = onWindows ? "solr.cmd" : "solr"; + export async function SetRunning(status: boolean): Promise { const args = status ? "start" : "stop -p 8983"; - console.log(`Solr management: trying to ${args}`); - exec(`${onWindows ? "solr.cmd" : "solr"} ${args}`, { cwd: "./solr-8.3.1/bin" }, (error, stdout, stderr) => { + console.log(`solr management: trying to ${args}`); + exec(`${command} ${args}`, { cwd: "./solr-8.3.1/bin" }, (error, stdout, stderr) => { if (error) { + console.log(red(`solr management error: unable to ${args} server`)); console.log(red(error.message)); - console.log(red(`Solr management error: unable to ${args}`)); } console.log(cyan(stdout)); console.log(yellow(stderr)); }); - return true; + try { + await get("http://localhost:8983"); + return true; + } catch { + return false; + } } } \ No newline at end of file diff --git a/src/server/DashSession.ts b/src/server/DashSession.ts index 83ce7caaf..47a63c64f 100644 --- a/src/server/DashSession.ts +++ b/src/server/DashSession.ts @@ -1,8 +1,8 @@ import { Session } from "./Session/session"; import { Email } from "./ActionUtilities"; -import { red, yellow } from "colors"; +import { red, yellow, cyan } from "colors"; import { SolrManager } from "./ApiManagers/SearchManager"; -import { execSync } from "child_process"; +import { exec } from "child_process"; import { Utils } from "../Utils"; import { WebSocket } from "./Websocket/Websocket"; import { MessageStore } from "./Message"; @@ -48,7 +48,14 @@ export class DashSessionAgent extends Session.AppliedSessionAgent { return true; } }); - monitor.addReplCommand("pull", [], () => execSync("git pull", { stdio: ["ignore", "inherit", "inherit"] })); + monitor.addReplCommand("pull", [], () => exec("git pull", (error, stdout, stderr) => { + if (error) { + monitor.log(red("unable to pull from version control")); + monitor.log(red(error.message)); + } + stdout.split("\n").forEach(line => line.length && monitor.execLog(cyan(line))); + stderr.split("\n").forEach(line => line.length && monitor.execLog(yellow(line))); + })); monitor.addReplCommand("solr", [/start|stop/], args => SolrManager.SetRunning(args[0] === "start")); return monitor; } diff --git a/src/server/Session/session.ts b/src/server/Session/session.ts index 06a076ae4..9a222b2eb 100644 --- a/src/server/Session/session.ts +++ b/src/server/Session/session.ts @@ -1,4 +1,4 @@ -import { red, cyan, green, yellow, magenta, blue, white } from "colors"; +import { red, cyan, green, yellow, magenta, blue, white, Color, grey, gray, black } from "colors"; import { on, fork, setupMaster, Worker, isMaster, isWorker } from "cluster"; import { get } from "request-promise"; import { Utils } from "../../Utils"; @@ -20,6 +20,20 @@ import { configurationSchema } from "./session_config_schema"; */ export namespace Session { + type ColorLabel = "yellow" | "red" | "cyan" | "green" | "blue" | "magenta" | "grey" | "gray" | "white" | "black"; + const colorMapping: Map = new Map([ + ["yellow", yellow], + ["red", red], + ["cyan", cyan], + ["green", green], + ["blue", blue], + ["magenta", magenta], + ["grey", grey], + ["gray", gray], + ["white", white], + ["black", black] + ]); + export abstract class AppliedSessionAgent { // the following two methods allow the developer to create a custom @@ -70,25 +84,50 @@ export namespace Session { } + interface Identifier { + text: string; + color: ColorLabel; + } + + interface Identifiers { + master: Identifier; + worker: Identifier; + exec: Identifier; + } + interface Configuration { showServerOutput: boolean; - masterIdentifier: string; - workerIdentifier: string; + identifiers: Identifiers; ports: { [description: string]: number }; - pollingRoute: string; - pollingIntervalSeconds: number; - pollingFailureTolerance: number; - [key: string]: any; + polling: { + route: string; + intervalSeconds: number; + failureTolerance: number; + }; } - const defaultConfiguration: Configuration = { + const defaultConfig: Configuration = { showServerOutput: false, - masterIdentifier: yellow("__monitor__:"), - workerIdentifier: magenta("__server__:"), + identifiers: { + master: { + text: "__monitor__", + color: "yellow" + }, + worker: { + text: "__server__", + color: "magenta" + }, + exec: { + text: "__exec__", + color: "green" + } + }, ports: { server: 3000 }, - pollingRoute: "/", - pollingIntervalSeconds: 30, - pollingFailureTolerance: 0 + polling: { + route: "/", + intervalSeconds: 30, + failureTolerance: 0 + } }; export type ExitHandler = (reason: Error | null) => void | Promise; @@ -118,7 +157,7 @@ export namespace Session { private static count = 0; private exitHandlers: ExitHandler[] = []; private readonly notifiers: Monitor.NotifierHooks | undefined; - private readonly configuration: Configuration; + private readonly config: Configuration; private onMessage: { [message: string]: Monitor.ServerMessageHandler[] | undefined } = {}; private activeWorker: Worker | undefined; private key: string | undefined; @@ -209,10 +248,11 @@ export namespace Session { console.log(this.timestamp(), cyan("initializing session...")); - this.configuration = this.loadAndValidateConfiguration(); + this.config = this.loadAndValidateConfiguration(); + this.initializeSessionKey(); // determines whether or not we see the compilation / initialization / runtime output of each child server process - setupMaster({ silent: !this.configuration.showServerOutput }); + setupMaster({ silent: !this.config.showServerOutput }); // handle exceptions in the master thread - there shouldn't be many of these // the IPC (inter process communication) channel closed exception can't seem @@ -238,7 +278,6 @@ export namespace Session { this.spawn(); } - /** * Generates a blue UTC string associated with the time * of invocation. @@ -249,7 +288,14 @@ export namespace Session { * A formatted, identified and timestamped log in color */ public log = (...optionalParams: any[]) => { - console.log(this.timestamp(), this.configuration.masterIdentifier, ...optionalParams); + console.log(this.timestamp(), this.config.identifiers.master.text, ...optionalParams); + } + + /** + * A formatted, identified and timestamped log in color for non- + */ + public execLog = (...optionalParams: any[]) => { + console.log(this.timestamp(), this.config.identifiers.exec.text, ...optionalParams); } /** @@ -269,30 +315,24 @@ export namespace Session { } /** - * Builds the repl that allows the following commands to be typed into stdin of the master thread. + * At any arbitrary layer of nesting within the configuration objects, any single value that + * is not specified by the configuration is given the default counterpart. If, within an object, + * one peer is given by configuration and two are not, the one is preserved while the two are given + * the default value. */ - private initializeRepl = (): Repl => { - const repl = new Repl({ identifier: () => `${this.timestamp()} ${this.configuration.masterIdentifier}` }); - const boolean = /true|false/; - const number = /\d+/; - const letters = /[a-zA-Z]+/; - repl.registerCommand("exit", [/clean|force/], args => this.killSession("manual exit requested by repl", args[0] === "clean", 0)); - repl.registerCommand("restart", [/clean|force/], args => this.tryKillActiveWorker(args[0] === "clean")); - repl.registerCommand("set", [letters, "port", number, boolean], args => this.setPort(args[0], Number(args[2]), args[3] === "true")); - repl.registerCommand("set", [/polling/, number, boolean], args => { - const newPollingIntervalSeconds = Math.floor(Number(args[2])); - if (newPollingIntervalSeconds < 0) { - this.log(red("the polling interval must be a non-negative integer")); - } else { - if (newPollingIntervalSeconds !== this.configuration.pollingIntervalSeconds) { - this.configuration.pollingIntervalSeconds = newPollingIntervalSeconds; - if (args[3] === "true") { - this.activeWorker?.send({ newPollingIntervalSeconds }); - } + private assign = (defaultObject: any, specifiedObject: any, collector: any) => { + Array.from(new Set([...Object.keys(defaultObject), ...Object.keys(specifiedObject)])).map(property => { + let defaultValue: any, specifiedValue: any; + if (specifiedValue = specifiedObject[property]) { + if (typeof specifiedValue === "object" && typeof (defaultValue = defaultObject[property]) === "object") { + this.assign(defaultValue, specifiedValue, collector[property] = {}); + } else { + collector[property] = specifiedValue; } + } else { + collector[property] = defaultObject[property]; } }); - return repl; } /** @@ -300,34 +340,19 @@ export namespace Session { * and pass down any variables the pertinent to the child processes as environment variables. */ private loadAndValidateConfiguration = (): Configuration => { + let config: Configuration; try { console.log(this.timestamp(), cyan("validating configuration...")); - const configuration: Configuration = JSON.parse(readFileSync('./session.config.json', 'utf8')); + config = JSON.parse(readFileSync('./session.config.json', 'utf8')); const options = { throwError: true, allowUnknownAttributes: false }; // ensure all necessary and no excess information is specified by the configuration file - validate(configuration, configurationSchema, options); - let formatMaster = true; - let formatWorker = true; - Object.keys(defaultConfiguration).forEach(property => { - if (!configuration[property]) { - if (property === "masterIdentifier") { - formatMaster = false; - } else if (property === "workerIdentifier") { - formatWorker = false; - } - configuration[property] = defaultConfiguration[property]; - } - }); - if (formatMaster) { - configuration.masterIdentifier = yellow(configuration.masterIdentifier + ":"); - } - if (formatWorker) { - configuration.workerIdentifier = magenta(configuration.workerIdentifier + ":"); - } - return configuration; + validate(config, configurationSchema, options); + const results: any = {}; + this.assign(defaultConfig, config, results); + config = results; } catch (error) { if (error instanceof ValidationError) { console.log(red("\nSession configuration failed.")); @@ -337,16 +362,50 @@ export namespace Session { } else if (error.code === "ENOENT" && error.path === "./session.config.json") { console.log(cyan("Loading default session parameters...")); console.log("Consider including a session.config.json configuration file in your project root for customization."); - return defaultConfiguration; + config = { ...defaultConfig }; } else { console.log(red("\nSession configuration failed.")); console.log("The following unknown error occurred during configuration."); console.log(error.stack); process.exit(0); } + } finally { + const { identifiers } = config!; + Object.keys(identifiers).forEach(key => { + const resolved = key as keyof Identifiers; + const { text, color } = identifiers[resolved]; + identifiers[resolved].text = (colorMapping.get(color) || white)(`${text}:`); + }); + return config!; } } + /** + * Builds the repl that allows the following commands to be typed into stdin of the master thread. + */ + private initializeRepl = (): Repl => { + const repl = new Repl({ identifier: () => `${this.timestamp()} ${this.config.identifiers.master.text}` }); + const boolean = /true|false/; + const number = /\d+/; + const letters = /[a-zA-Z]+/; + repl.registerCommand("exit", [/clean|force/], args => this.killSession("manual exit requested by repl", args[0] === "clean", 0)); + repl.registerCommand("restart", [/clean|force/], args => this.tryKillActiveWorker(args[0] === "clean")); + repl.registerCommand("set", [letters, "port", number, boolean], args => this.setPort(args[0], Number(args[2]), args[3] === "true")); + repl.registerCommand("set", [/polling/, number, boolean], args => { + const newPollingIntervalSeconds = Math.floor(Number(args[2])); + if (newPollingIntervalSeconds < 0) { + this.log(red("the polling interval must be a non-negative integer")); + } else { + if (newPollingIntervalSeconds !== this.config.polling.intervalSeconds) { + this.config.polling.intervalSeconds = newPollingIntervalSeconds; + if (args[3] === "true") { + this.activeWorker?.send({ newPollingIntervalSeconds }); + } + } + } + }); + return repl; + } private executeExitHandlers = async (reason: Error | null) => Promise.all(this.exitHandlers.map(handler => handler(reason))); @@ -374,7 +433,7 @@ export namespace Session { */ private setPort = (port: "server" | "socket" | string, value: number, immediateRestart: boolean): void => { if (value > 1023 && value < 65536) { - this.configuration.ports[port] = value; + this.config.ports[port] = value; if (immediateRestart) { this.tryKillActiveWorker(); } @@ -389,18 +448,20 @@ export namespace Session { */ private spawn = (): void => { const { - pollingRoute, - pollingFailureTolerance, - pollingIntervalSeconds, + polling: { + route, + failureTolerance, + intervalSeconds + }, ports - } = this.configuration; + } = this.config; this.tryKillActiveWorker(); this.activeWorker = fork({ - pollingRoute, - pollingFailureTolerance, + pollingRoute: route, + pollingFailureTolerance: failureTolerance, serverPort: ports.server, socketPort: ports.socket, - pollingIntervalSeconds, + pollingIntervalSeconds: intervalSeconds, session_key: this.key }); this.log(cyan(`spawned new server worker with process id ${this.activeWorker.process.pid}`)); @@ -408,7 +469,7 @@ export namespace Session { this.activeWorker.on("message", async ({ lifecycle, action }) => { if (action) { const { message, args } = action as Monitor.Action; - console.log(this.timestamp(), `${this.configuration.workerIdentifier} action requested (${cyan(message)})`); + console.log(this.timestamp(), `${this.config.identifiers.worker.text} action requested (${cyan(message)})`); switch (message) { case "kill": const { reason, graceful, errorCode } = args; @@ -432,7 +493,7 @@ export namespace Session { handlers.forEach(handler => handler({ message, args })); } } else if (lifecycle) { - console.log(this.timestamp(), `${this.configuration.workerIdentifier} lifecycle phase (${lifecycle})`); + console.log(this.timestamp(), `${this.config.identifiers.worker.text} lifecycle phase (${lifecycle})`); } }); } diff --git a/src/server/Session/session_config_schema.ts b/src/server/Session/session_config_schema.ts index 5a85a45e3..e32cf8c6a 100644 --- a/src/server/Session/session_config_schema.ts +++ b/src/server/Session/session_config_schema.ts @@ -1,39 +1,67 @@ import { Schema } from "jsonschema"; +const colorPattern = /black|red|green|yellow|blue|magenta|cyan|white|gray|grey/; + +const identifierProperties: Schema = { + type: "object", + properties: { + text: { + type: "string", + minLength: 1 + }, + color: { + type: "string", + pattern: colorPattern + } + } +}; + +const portProperties: Schema = { + type: "number", + minimum: 1024, + maximum: 65535 +}; + export const configurationSchema: Schema = { id: "/configuration", type: "object", properties: { + showServerOutput: { type: "boolean" }, ports: { type: "object", properties: { - server: { type: "number", minimum: 1024, maximum: 65535 }, - socket: { type: "number", minimum: 1024, maximum: 65535 } + server: portProperties, + socket: portProperties }, required: ["server"], additionalProperties: true }, - pollingRoute: { - type: "string", - pattern: /\/[a-zA-Z]*/g - }, - masterIdentifier: { - type: "string", - minLength: 1 - }, - workerIdentifier: { - type: "string", - minLength: 1 + identifiers: { + type: "object", + properties: { + master: identifierProperties, + worker: identifierProperties, + exec: identifierProperties + } }, - showServerOutput: { type: "boolean" }, - pollingIntervalSeconds: { - type: "number", - minimum: 1, - maximum: 86400 + polling: { + type: "object", + additionalProperties: false, + properties: { + intervalSeconds: { + type: "number", + minimum: 1, + maximum: 86400 + }, + route: { + type: "string", + pattern: /\/[a-zA-Z]*/g + }, + failureTolerance: { + type: "number", + minimum: 0, + } + } }, - pollingFailureTolerance: { - type: "number", - minimum: 0, - } } }; \ No newline at end of file -- cgit v1.2.3-70-g09d2