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

Ostrowfm prod #10

Open
wants to merge 156 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
0bd1e78
change configuration
Nov 30, 2016
4746243
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 2, 2016
fb40566
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 2, 2016
b9a683b
fixing update-build
Dec 2, 2016
af274a9
fixing update-build
Dec 2, 2016
3d7ba03
fixing configuration
Dec 2, 2016
72d4cda
fixing configuration
Dec 2, 2016
52411ac
Merge remote-tracking branch 'refs/remotes/origin/master' into ostrow…
masmeka Dec 2, 2016
782de99
Merge remote-tracking branch 'refs/remotes/origin/master' into ostrow…
masmeka Dec 2, 2016
e88f76b
Merge branch 'master' into ostrowfm-prod
masmeka Dec 2, 2016
06389af
Merge branch 'master' into ostrowfm-prod
masmeka Dec 2, 2016
1d9cfa9
fixing update build script
Dec 5, 2016
0e22b34
fixing update build script
Dec 5, 2016
de72bab
merge with ostrowfm
Dec 5, 2016
92da9a9
merge with ostrowfm
Dec 5, 2016
1bdabe9
fix connfiguration file
Dec 5, 2016
e78f9bf
fix connfiguration file
Dec 5, 2016
a2cc627
merge with ostrowfm
Dec 5, 2016
cf4e294
merge with ostrowfm
Dec 5, 2016
f85ed39
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 6, 2016
fcfd665
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 6, 2016
694ff35
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 7, 2016
fe2bb38
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 7, 2016
26cd0c8
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 7, 2016
2d92a3e
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 7, 2016
128e751
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 9, 2016
fc6d6f5
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 9, 2016
559de97
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 9, 2016
8289443
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 9, 2016
41996df
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 10, 2016
d8b597b
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 10, 2016
9f49cd2
Merge branch 'master' into ostrowfm-prod
masmeka Dec 10, 2016
4a0127a
Merge branch 'master' into ostrowfm-prod
masmeka Dec 10, 2016
8cb2220
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 13, 2016
ee9f34a
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 13, 2016
d4cbb4a
Merge branch 'master' into ostrowfm-prod
masmeka Dec 14, 2016
8d2d6e0
Merge branch 'master' into ostrowfm-prod
masmeka Dec 14, 2016
a046725
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 15, 2016
21bf3a2
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 15, 2016
5265e8d
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 15, 2016
59d2bf0
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 15, 2016
579472e
Merge branch 'master' into ostrowfm-prod
masmeka Dec 16, 2016
2dbdaaa
Merge branch 'master' into ostrowfm-prod
masmeka Dec 16, 2016
1e0de84
merging
Dec 19, 2016
2fb5228
merging
Dec 19, 2016
fed4e87
Merge branch 'master' into ostrowfm-prod
masmeka Dec 19, 2016
7fcf962
Merge branch 'master' into ostrowfm-prod
masmeka Dec 19, 2016
220dfd9
fix configuration
Dec 20, 2016
1510737
fix configuration
Dec 20, 2016
99ce6ea
fixing update build
Dec 20, 2016
e41c450
fixing update build
Dec 20, 2016
b6eba0d
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 20, 2016
2cfd9a0
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 20, 2016
0828f40
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 21, 2016
ee2747f
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 21, 2016
2e8f3f2
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 22, 2016
443d0da
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 22, 2016
cd264fd
Merge branch 'ostrowfm-prod' of https://github.com/eaciit/windapp int…
masmeka Dec 29, 2016
70f6011
Merge branch 'ostrowfm-prod' of https://github.com/eaciit/windapp int…
masmeka Dec 29, 2016
a2c8310
Merge branch 'master' into ostrowfm-prod
masmeka Dec 29, 2016
ec73ca3
Merge branch 'master' into ostrowfm-prod
masmeka Dec 29, 2016
c9ec124
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 30, 2016
0f0745e
Merge branch 'ostrowfm' into ostrowfm-prod
Dec 30, 2016
41849db
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 3, 2017
795d96d
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 5, 2017
c64ad51
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 6, 2017
a5c2ea0
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 9, 2017
1d35a15
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 10, 2017
22aa0d7
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 11, 2017
705e840
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 12, 2017
1b38620
fix the configuration
Jan 13, 2017
f822922
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 16, 2017
99f8759
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 17, 2017
10341c5
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 18, 2017
03f5ab2
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 19, 2017
eadb839
Merge branch 'ostrowfm' into ostrowfm-prod
Jan 20, 2017
38b808c
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Feb 3, 2017
036734f
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Feb 10, 2017
bde89d0
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Feb 16, 2017
9f6a0fb
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Feb 16, 2017
27359d0
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Feb 20, 2017
614af40
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Feb 22, 2017
abf5b90
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Feb 24, 2017
62a392e
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Feb 27, 2017
52cacc9
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Mar 3, 2017
6834e4c
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Mar 7, 2017
6874822
change db configurations to move to the new server
frezadev Mar 10, 2017
0250321
configuration
frezadev Mar 13, 2017
62ec153
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Mar 30, 2017
8aa6f3c
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Apr 5, 2017
cf2ae0e
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Apr 7, 2017
b93dfeb
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Apr 10, 2017
95a6c52
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Apr 12, 2017
ce6c71e
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Apr 13, 2017
abeef32
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Apr 26, 2017
33586b6
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev May 2, 2017
f33f10c
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev May 8, 2017
f913388
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev May 19, 2017
0452847
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Jun 2, 2017
c8d8c1f
changes on update script
frezadev Jun 5, 2017
cf69721
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Jun 7, 2017
7dfef2f
Merge branch 'ostrowfm' into ostrowfm-prod
frezadev Jun 8, 2017
f0707d3
Merge branch 'ostrowfm-prod' of https://github.com/eaciit/windapp int…
masmeka Jul 25, 2017
5666979
Ignore app.conf
masmeka Aug 11, 2017
e0942b5
Merge branch 'master' into ostrowfm-prod
masmeka Aug 11, 2017
0305c63
Merge branch 'master' into ostrowfm-prod
masmeka Aug 24, 2017
b42922c
Merge branch 'master' into ostrowfm-prod
masmeka Aug 25, 2017
3f8b8f0
Merge branch 'master' into ostrowfm-prod
masmeka Aug 25, 2017
5f1db66
Merge branch 'master' into ostrowfm-prod
masmeka Aug 29, 2017
531fa14
Merge branch 'master' into ostrowfm-prod
masmeka Aug 29, 2017
0c64726
Merge branch 'master' into ostrowfm-prod
masmeka Aug 30, 2017
e212043
Merge branch 'master' into ostrowfm-prod
masmeka Sep 4, 2017
4caf8e6
Merge branch 'master' into ostrowfm-prod
masmeka Sep 6, 2017
22cdbf0
Merge branch 'master' into ostrowfm-prod
masmeka Sep 6, 2017
a78ec1f
Merge branch 'master' into ostrowfm-prod
masmeka Sep 6, 2017
f4676c5
Merge branch 'master' into ostrowfm-prod
masmeka Sep 7, 2017
e2c0614
Merge branch 'master' into ostrowfm-prod
masmeka Sep 7, 2017
960e177
Merge branch 'master' into ostrowfm-prod
masmeka Sep 7, 2017
5291729
Merge branch 'master' into ostrowfm-prod
masmeka Sep 7, 2017
5f45138
Merge branch 'master' into ostrowfm-prod
masmeka Sep 8, 2017
6cb43e9
Bug fixing error timeout like data race when initiate grid alarm
masmeka Sep 8, 2017
fc18f51
Revert "Bug fixing error timeout like data race when initiate grid al…
masmeka Sep 8, 2017
fa97704
Merge branch 'master' into ostrowfm-prod
masmeka Sep 8, 2017
fe24d8c
Merge branch 'master' into ostrowfm-prod
masmeka Sep 9, 2017
b53ab6c
Merge branch 'master' into ostrowfm-prod
masmeka Sep 11, 2017
cb071bd
Merge branch 'master' into ostrowfm-prod
masmeka Sep 18, 2017
c7d89da
Merge branch 'master' into ostrowfm-prod
masmeka Sep 21, 2017
345a131
Merge branch 'master' into ostrowfm-prod
masmeka Sep 25, 2017
fff6357
Merge branch 'master' into ostrowfm-prod
masmeka Sep 26, 2017
a2d7ad9
Merge branch 'master' into ostrowfm-prod
masmeka Sep 26, 2017
3dc68e8
Merge branch 'master' into ostrowfm-prod
masmeka Sep 26, 2017
e12f899
Merge branch 'master' into ostrowfm-prod
masmeka Sep 26, 2017
ece412a
Merge branch 'master' into ostrowfm-prod
masmeka Sep 26, 2017
527150a
Merge branch 'master' into ostrowfm-prod
masmeka Sep 26, 2017
2f3f269
Merge branch 'master' into ostrowfm-prod
masmeka Sep 26, 2017
43e01da
Merge branch 'master' into ostrowfm-prod
masmeka Sep 28, 2017
78bf716
Merge branch 'master' into ostrowfm-prod
masmeka Oct 4, 2017
200c45f
Merge branch 'master' into ostrowfm-prod
masmeka Oct 4, 2017
20fbc22
Merge branch 'master' into ostrowfm-prod
masmeka Oct 8, 2017
974bcac
Merge branch 'master' into ostrowfm-prod
masmeka Oct 8, 2017
ab66ff1
Merge branch 'master' into ostrowfm-prod
masmeka Oct 8, 2017
2c0457a
Merge branch 'master' into ostrowfm-prod
masmeka Oct 9, 2017
ee48555
Merge branch 'master' into ostrowfm-prod
masmeka Oct 11, 2017
9b19ea8
Merge branch 'master' into ostrowfm-prod
masmeka Oct 13, 2017
fca2832
Merge branch 'master' into ostrowfm-prod
masmeka Oct 19, 2017
9e03637
Merge branch 'master' into ostrowfm-prod
Nov 6, 2017
68a2a52
Merge branch 'master' into ostrowfm-prod
masmeka Dec 12, 2017
4d25e0e
Merge branch 'master' into ostrowfm-prod
masmeka Dec 12, 2017
89a3d48
Merge branch 'master' into ostrowfm-prod
masmeka Dec 12, 2017
26df6e0
Merge branch 'master' into ostrowfm-prod
masmeka Jan 22, 2018
65c3146
Merge branch 'master' into ostrowfm-prod
masmeka Feb 1, 2018
3a73345
Merge branch 'master' into ostrowfm-prod
masmeka Apr 3, 2018
011982b
Merge branch 'master' into ostrowfm-prod
masmeka Jun 6, 2018
5de6402
Update configurations.json
masmeka Jul 5, 2018
6caaa2b
Update app.conf
masmeka Jul 5, 2018
77b01a0
Merge branch 'master' into ostrowfm-prod
masmeka Jul 26, 2018
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
12 changes: 6 additions & 6 deletions update-build.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
sudo pkill wfdemo-git-oem
sudo pkill wfdemo-git-prod

git reset --hard

rm wfdemo-git-oem
sudo mv nohup.out /mnt/data/ostrorealtime/applog/log_oem_$(date +"%Y%m%d_%H%M%S")
rm wfdemo-git-prod
sudo rm nohup.out

git pull

$GOPATH/bin/gorep -path="." -from="eaciit/wfdemo-git" -to="eaciit/wfdemo-git-oem"
$GOPATH/bin/gorep -path="." -from="eaciit/wfdemo-git" -to="eaciit/wfdemo-git-prod"

go build -o wfdemo-git-oem
sudo nohup ./wfdemo-git-oem &
go build -o wfdemo-git-prod
sudo nohup ./wfdemo-git-prod &