Skip to content

Commit

Permalink
fix bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Wang Hualong committed Jun 22, 2018
1 parent 436c589 commit 7396e11
Show file tree
Hide file tree
Showing 46 changed files with 57 additions and 174 deletions.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion public/build/1.a2a290aabf5c9d0da40c.js.map~dev

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions public/build/dark.347ee8f221c2f1ce9131.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/build/dark.347ee8f221c2f1ce9131.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions public/build/dark.a2a290aabf5c9d0da40c.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/dark.a2a290aabf5c9d0da40c.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions public/build/light.347ee8f221c2f1ce9131.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/build/light.347ee8f221c2f1ce9131.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions public/build/light.a2a290aabf5c9d0da40c.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/light.a2a290aabf5c9d0da40c.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions public/build/manifest.347ee8f221c2f1ce9131.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions public/build/manifest.a2a290aabf5c9d0da40c.js

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

135 changes: 0 additions & 135 deletions public/build/vendor.a2a290aabf5c9d0da40c.js~dev

This file was deleted.

2 changes: 1 addition & 1 deletion public/views/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,6 @@
<!-- End Google Tag Manager -->
[[end]]

<script type="text/javascript" src="public/build/manifest.a2a290aabf5c9d0da40c.js"></script><script type="text/javascript" src="public/build/vendor.a2a290aabf5c9d0da40c.js"></script><script type="text/javascript" src="public/build/app.a2a290aabf5c9d0da40c.js"></script></body>
<script type="text/javascript" src="public/build/manifest.347ee8f221c2f1ce9131.js"></script><script type="text/javascript" src="public/build/vendor.347ee8f221c2f1ce9131.js"></script><script type="text/javascript" src="public/build/app.347ee8f221c2f1ce9131.js"></script></body>

</html>
Binary file modified test/windows/data/grafana.db
Binary file not shown.
21 changes: 21 additions & 0 deletions test/windows/data/log/grafana.log
Original file line number Diff line number Diff line change
Expand Up @@ -371,3 +371,24 @@ t=2018-06-15T15:29:58+0800 lvl=info msg="Initializing HTTP Server" logger=http.s
t=2018-06-15T15:30:03+0800 lvl=info msg="Request Completed" logger=context userId=0 orgId=0 uname= method=GET path=/ status=302 remote_addr=[::1] time_ms=16 size=29 referer=
t=2018-06-15T15:30:03+0800 lvl=info msg="Request Completed" logger=context userId=0 orgId=0 uname= method=GET path=/login status=302 remote_addr=[::1] time_ms=12 size=24 referer=
>>>>>>> dev
t=2018-06-22T12:49:34+0800 lvl=info msg="Starting Grafana" logger=server version=5.1.3 commit=087143285 compiled=2018-05-16T23:39:55+0800
t=2018-06-22T12:49:34+0800 lvl=info msg="Config loaded from" logger=settings file=E:\\learning\\grafana-chinese\\test\\windows/conf/defaults.ini
t=2018-06-22T12:49:34+0800 lvl=info msg="Path Home" logger=settings path=E:\\learning\\grafana-chinese\\test\\windows
t=2018-06-22T12:49:34+0800 lvl=info msg="Path Data" logger=settings path=E:\\learning\\grafana-chinese\\test\\windows\\data
t=2018-06-22T12:49:34+0800 lvl=info msg="Path Logs" logger=settings path=E:\\learning\\grafana-chinese\\test\\windows\\data\\log
t=2018-06-22T12:49:34+0800 lvl=info msg="Path Plugins" logger=settings path=E:\\learning\\grafana-chinese\\test\\windows\\data\\plugins
t=2018-06-22T12:49:34+0800 lvl=info msg="Path Provisioning" logger=settings path=E:\\learning\\grafana-chinese\\test\\windows\\conf\\provisioning
t=2018-06-22T12:49:34+0800 lvl=info msg="App mode production" logger=settings
t=2018-06-22T12:49:34+0800 lvl=info msg="Initializing DB" logger=sqlstore dbtype=sqlite3
t=2018-06-22T12:49:34+0800 lvl=info msg="Starting DB migration" logger=migrator
t=2018-06-22T12:49:35+0800 lvl=info msg="Executing migration" logger=migrator id="copy data account to org"
t=2018-06-22T12:49:35+0800 lvl=info msg="Skipping migration condition not fulfilled" logger=migrator id="copy data account to org"
t=2018-06-22T12:49:35+0800 lvl=info msg="Executing migration" logger=migrator id="copy data account_user to org_user"
t=2018-06-22T12:49:35+0800 lvl=info msg="Skipping migration condition not fulfilled" logger=migrator id="copy data account_user to org_user"
t=2018-06-22T12:49:35+0800 lvl=info msg="Starting plugin search" logger=plugins
t=2018-06-22T12:49:35+0800 lvl=info msg="Initializing Alerting" logger=alerting.engine
t=2018-06-22T12:49:35+0800 lvl=info msg="Initializing CleanUpService" logger=cleanup
t=2018-06-22T12:49:35+0800 lvl=info msg="Initializing Stream Manager"
t=2018-06-22T12:49:35+0800 lvl=info msg="Initializing HTTP Server" logger=http.server address=0.0.0.0:3000 protocol=http subUrl= socket=
t=2018-06-22T12:49:39+0800 lvl=info msg="Request Completed" logger=context userId=0 orgId=0 uname= method=GET path=/ status=302 remote_addr=[::1] time_ms=8 size=29 referer=
t=2018-06-22T12:49:40+0800 lvl=info msg="Request Completed" logger=context userId=0 orgId=0 uname= method=GET path=/login status=302 remote_addr=[::1] time_ms=41 size=24 referer=
Binary file added test/windows/data/sessions/c/7/c79c3f95fdd03b59
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions test/windows/public/build/1.a2a290aabf5c9d0da40c.js

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions test/windows/public/build/dark.347ee8f221c2f1ce9131.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions test/windows/public/build/dark.347ee8f221c2f1ce9131.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions test/windows/public/build/dark.a2a290aabf5c9d0da40c.js

This file was deleted.

1 change: 0 additions & 1 deletion test/windows/public/build/dark.a2a290aabf5c9d0da40c.js.map

This file was deleted.

2 changes: 2 additions & 0 deletions test/windows/public/build/light.347ee8f221c2f1ce9131.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions test/windows/public/build/light.a2a290aabf5c9d0da40c.js

This file was deleted.

This file was deleted.

2 changes: 2 additions & 0 deletions test/windows/public/build/manifest.347ee8f221c2f1ce9131.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7396e11

Please sign in to comment.