[vz-users] Volkszähler 2.0 - Neue Features
Andreas Götz
cpuidle at gmail.com
Fri Mar 22 15:12:34 CET 2019
Apache conf angepasst? Siehe Mailingliste.
Viele Grüße,
Andreas
> Am 22.03.2019 um 13:41 schrieb dl4huf <dl4huf at t-online.de>:
>
> Hallo
>
> Ich wollte eben mal testen ob ich das Update hinbekomme.
> Leider nein.
> Umgebung : Volkszähler läuft auf einem virtuellen Ubuntu 16.0.4.
> Die Daten kommen von einem 5xS0-Hutschienen-Controller (Ethersex).
>
> In dem Ubuntu habe ich die PHP-Version von 7.0 auf 7.3 angehoben :
>
> #sudo add-apt-repository ppa:ondrej/php
> #sudo apt-get update
> #sudo apt-get install php7.3
> #php -v
> PHP 7.3.3-1+ubuntu16.04.1+deb.sury.org+1 (cli) (built: Mar 7 2019 20:31:26) ( NTS )
> Copyright (c) 1997-2018 The PHP Group
> Zend Engine v3.3.3, Copyright (c) 1998-2018 Zend Technologies
> with Zend OPcache v7.3.3-1+ubuntu16.04.1+deb.sury.org+1, Copyright (c) 1999-2018, by Zend Technologies
>
> dann:
>
> #cd /var/www/volkszaehler.org
> #git pull
> # git pull
> remote: Enumerating objects: 491, done.
> remote: Counting objects: 100% (491/491), done.
> remote: Compressing objects: 100% (27/27), done.
> remote: Total 1004 (delta 469), reused 480 (delta 464), pack-reused 513
> Empfange Objekte: 100% (1004/1004), 380.01 KiB | 0 bytes/s, Fertig.
> Löse Unterschiede auf: 100% (748/748), abgeschlossen mit 128 lokalen Objekten.
> Von https://github.com/volkszaehler/volkszaehler.org
> e2205a5..005c300 master -> origin/master
> * [neues Tag] 0.6 -> 0.6
> * [neues Tag] 0.7 -> 0.7
> * [neues Tag] 1.0 -> 1.0
> Aktualisiere e2205a5..005c300
> Fast-forward
> .dockerignore | 3 +
> .gitignore | 18 +-
> .gitmodules | 3 -
> .php_cs | 32 +++
> .phpstan.neon | 13 ++
> .travis.yml | 137 +++++------
> Dockerfile | 25 ++
> INSTALL | 33 ---
> COPYING => LICENSE | 55 ++++-
> README.md | 39 ++--
> {misc/tools => bin}/README.md | 34 ++-
> bin/aggregate | 271 ++++++++++++++++++++++
> {misc/tools => bin}/calert | 13 +-
> misc/tools/doctrine.php => bin/doctrine | 8 +-
> {misc/tools => bin}/install.sh | 137 +++++++----
> {misc/tools => bin}/jsonclient | 6 +-
> misc/tools/model-helper.php => bin/model-helper | 8 +-
> misc/tools/push-server.php => bin/push-server | 21 +-
> {misc/tools => bin}/vzclient | 78 +++++--
> misc/tools/vzcompress2.php => bin/vzcompress2 | 13 +-
> {misc/tools => bin}/vzmonitor | 9 +-
> composer.json | 45 ++--
> docker-compose.yml | 35 +++
> etc/config.dist.yaml | 43 ++++
> etc/volkszaehler.conf.template.php | 156 -------------
> gulpfile.js | 4 +-
> htdocs/.htaccess | 20 +-
> htdocs/css/print.css | 20 ++
> htdocs/css/style.css | 111 ++++++++-
> htdocs/index.html | 128 ++++++++---
> htdocs/js/entities.js | 119 ++++++----
> htdocs/js/entity.js | 668 ++++++++++++++++++++++++++++++------------------------
> htdocs/js/functions.js | 139 +++++++++---
> htdocs/js/init.js | 19 +-
> htdocs/js/jquery/jquery-ext.min.js | 2 +-
> htdocs/js/jquery/jquery-extensions.js | 32 +--
> htdocs/js/jquery/jquery.treeTable.js | 8 +-
> htdocs/js/middleware.js | 5 +-
> htdocs/js/options.js | 32 ++-
> htdocs/js/plot.js | 384 +++++++++++++++++++++++++++++++
> htdocs/js/wui.js | 465 ++++++++++++++-----------------------
> htdocs/middleware.php | 5 +-
> htdocs/vendor/flot/flot.min.js | 6 +-
> htdocs/vendor/flot/jquery.flot.js | 178 ++++++++++++++-
> htdocs/vendor/flot/jquery.flot.orderBars.js | 278 +++++++++++++++++++++++
> htdocs/vendor/jquery/jquery-2.1.3.min.js | 4 -
> htdocs/vendor/jquery/jquery-3.3.1.min.js | 2 +
> htdocs/vendor/nprogress.min.js | 1 +
> lib/Controller/AggregatorController.php | 73 +++---
> lib/Controller/CapabilitiesController.php | 24 +-
> lib/Controller/ChannelController.php | 30 +--
> lib/Controller/Controller.php | 42 ++--
> lib/Controller/DataController.php | 82 +++++--
> lib/Controller/EntityController.php | 162 +++----------
> lib/Controller/IotController.php | 33 +--
> lib/Controller/PrognosisController.php | 159 +++++++++++++
> lib/Controller/QueryController.php | 104 +++++++++
> lib/Definition/Definition.php | 28 ++-
> lib/Definition/EntityDefinition.json | 192 +++++++++++-----
> lib/Definition/EntityDefinition.php | 31 ++-
> lib/Definition/PropertyDefinition.json | 95 +++++++-
> lib/Definition/PropertyDefinition.php | 15 +-
> lib/Interpreter/AccumulatorInterpreter.php | 47 ++--
> lib/Interpreter/AggregatorInterpreter.php | 30 ++-
> lib/Interpreter/DataIterator.php | 23 +-
> lib/Interpreter/ImpulseInterpreter.php | 47 ++--
> lib/Interpreter/Interpreter.php | 190 +++++++++-------
> lib/Interpreter/SQL/MySQLAggregateOptimizer.php | 106 ++++-----
> lib/Interpreter/SQL/MySQLOptimizer.php | 151 +++++-------
> lib/Interpreter/SQL/PostgreSQLOptimizer.php | 34 ++-
> lib/Interpreter/SQL/SQLOptimizer.php | 210 +++++++++++------
> lib/Interpreter/SQL/SQLiteOptimizer.php | 7 +-
> lib/Interpreter/SQL/SensorInterpreterAverageTrait.php | 84 +++++++
> lib/Interpreter/SensorInterpreter.php | 29 ++-
> lib/Interpreter/Virtual/DelayedIterator.php | 70 ++++++
> lib/Interpreter/Virtual/GroupedTimestampIterator.php | 102 +++++++++
> lib/Interpreter/Virtual/InterpreterCoordinatorTrait.php | 94 ++++++++
> lib/Interpreter/Virtual/InterpreterProxy.php | 135 +++++++++++
> lib/{Exception/ConfigurationException.php => Interpreter/Virtual/LookbackIterator.php} | 44 ++--
> lib/Interpreter/Virtual/TimestampGenerator.php | 97 ++++++++
> lib/{Exception/HttpExceptionInterface.php => Interpreter/Virtual/TimestampIterator.php} | 24 +-
> lib/Interpreter/VirtualInterpreter.php | 308 +++++++++++++++++++++++++
> lib/Model/Aggregate.php | 6 +-
> lib/Model/Aggregator.php | 6 +-
> lib/Model/Channel.php | 36 +--
> lib/Model/Data.php | 6 +-
> lib/Model/Entity.php | 34 ++-
> lib/Model/Property.php | 6 +-
> lib/Router.php | 51 ++---
> lib/Server/HttpReceiver.php | 44 ++--
> lib/Server/MiddlewareAdapter.php | 17 +-
> lib/Server/PPMBootstrapAdapter.php | 17 +-
> lib/Server/PushTransportInterface.php | 5 +-
> lib/Server/WampClientAdapter.php | 11 +-
> lib/Server/WsClientAdapter.php | 7 +-
> lib/Util/Aggregation.php | 217 +++++++++++-------
> lib/Util/Configuration.php | 19 +-
> lib/Util/ConsoleApplication.php | 5 +-
> lib/Util/ConsoleSQLLogger.php | 67 ++++++
> lib/Util/Debug.php | 33 +--
> lib/Util/EntityFactory.php | 246 ++++++++++++++++++++
> lib/Util/JSON.php | 8 +-
> lib/Util/Random.php | 148 ------------
> lib/Util/UUID.php | 336 ---------------------------
> lib/View/CSV.php | 20 +-
> lib/View/JSON.php | 15 +-
> lib/View/JpGraph.php | 261 ---------------------
> lib/View/Text.php | 20 +-
> lib/View/View.php | 24 +-
> lib/bootstrap.php | 30 ++-
> misc/controller/1wire/log_onewire.sh | 107 ---------
> misc/controller/1wire/log_onewire_ecmd.pl | 111 ---------
> misc/controller/1wire/log_onewire_ecmd.sh | 60 -----
> misc/controller/README | 29 ---
> misc/controller/digitalstrom/dss.sh | 53 -----
> misc/controller/mbus/install.sh | 18 --
> misc/controller/mbus/mbus-cmd | 215 ------------------
> misc/controller/mbus/mbus.pm | 537 -------------------------------------------
> misc/controller/mbus/mbusconf.pm | 11 -
> misc/controller/misc/log_i2c_ds1631_ecmd.sh | 61 -----
> misc/controller/misc/log_open2300.sh | 108 ---------
> misc/controller/misc/log_rawS0.lua | 133 -----------
> misc/controller/misc/log_rawS0.sh | 33 ---
> misc/controller/misc/log_usbflukso.sh | 37 ---
> misc/controller/misc/log_weather.sh | 74 ------
> misc/controller/misc/log_weather_wu.sh | 133 -----------
> misc/frontend/fnordlicht | 1 -
> misc/sql/README | 2 +-
> misc/tools/aggregate.php | 190 ----------------
> misc/tools/doctrine | 5 -
> phpunit.xml | 20 +-
> test/AccumulatorTest.php | 4 +-
> test/AggregationPerformanceTest.php | 146 ------------
> test/AggregationTest.php | 34 +--
> test/CapabilitiesTest.php | 3 +-
> test/ChannelTest.php | 3 +-
> test/Data.php | 29 ++-
> test/DataPerformance.php | 7 +-
> test/EntityTest.php | 62 ++++-
> test/FormatTest.php | 29 +--
> test/GroupTest.php | 14 +-
> test/ImpulseTest.php | 3 +-
> test/InterpreterTrait.php | 63 +++++
> test/IotTest.php | 40 ++++
> test/Middleware.php | 51 +++--
> test/PrognosisTest.php | 48 ++++
> test/ProtocolTest.php | 9 +-
> test/PushServerTest.php | 5 +-
> test/QueryTest.php | 34 +++
> test/RawTest.php | 7 +-
> test/SensorTest.php | 35 ++-
> test/SetupPerformanceData.php | 3 +-
> test/VirtualTest.php | 421 ++++++++++++++++++++++++++++++++++
> 153 files changed, 6278 insertions(+), 5172 deletions(-)
> create mode 100644 .dockerignore
> delete mode 100644 .gitmodules
> create mode 100644 .php_cs
> create mode 100644 .phpstan.neon
> create mode 100644 Dockerfile
> delete mode 100644 INSTALL
> rename COPYING => LICENSE (92%)
> rename {misc/tools => bin}/README.md (90%)
> create mode 100755 bin/aggregate
> rename {misc/tools => bin}/calert (93%)
> rename misc/tools/doctrine.php => bin/doctrine (84%)
> mode change 100644 => 100755
> rename {misc/tools => bin}/install.sh (64%)
> rename {misc/tools => bin}/jsonclient (92%)
> rename misc/tools/model-helper.php => bin/model-helper (93%)
> mode change 100644 => 100755
> rename misc/tools/push-server.php => bin/push-server (83%)
> rename {misc/tools => bin}/vzclient (61%)
> rename misc/tools/vzcompress2.php => bin/vzcompress2 (96%)
> rename {misc/tools => bin}/vzmonitor (95%)
> create mode 100755 docker-compose.yml
> create mode 100644 etc/config.dist.yaml
> delete mode 100644 etc/volkszaehler.conf.template.php
> create mode 100644 htdocs/css/print.css
> create mode 100644 htdocs/js/plot.js
> create mode 100644 htdocs/vendor/flot/jquery.flot.orderBars.js
> delete mode 100644 htdocs/vendor/jquery/jquery-2.1.3.min.js
> create mode 100644 htdocs/vendor/jquery/jquery-3.3.1.min.js
> create mode 100644 htdocs/vendor/nprogress.min.js
> create mode 100644 lib/Controller/PrognosisController.php
> create mode 100644 lib/Controller/QueryController.php
> create mode 100644 lib/Interpreter/SQL/SensorInterpreterAverageTrait.php
> create mode 100644 lib/Interpreter/Virtual/DelayedIterator.php
> create mode 100644 lib/Interpreter/Virtual/GroupedTimestampIterator.php
> create mode 100644 lib/Interpreter/Virtual/InterpreterCoordinatorTrait.php
> create mode 100644 lib/Interpreter/Virtual/InterpreterProxy.php
> rename lib/{Exception/ConfigurationException.php => Interpreter/Virtual/LookbackIterator.php} (52%)
> create mode 100644 lib/Interpreter/Virtual/TimestampGenerator.php
> rename lib/{Exception/HttpExceptionInterface.php => Interpreter/Virtual/TimestampIterator.php} (63%)
> create mode 100644 lib/Interpreter/VirtualInterpreter.php
> create mode 100644 lib/Util/ConsoleSQLLogger.php
> create mode 100644 lib/Util/EntityFactory.php
> delete mode 100644 lib/Util/Random.php
> delete mode 100644 lib/Util/UUID.php
> delete mode 100644 lib/View/JpGraph.php
> delete mode 100755 misc/controller/1wire/log_onewire.sh
> delete mode 100755 misc/controller/1wire/log_onewire_ecmd.pl
> delete mode 100755 misc/controller/1wire/log_onewire_ecmd.sh
> delete mode 100644 misc/controller/README
> delete mode 100755 misc/controller/digitalstrom/dss.sh
> delete mode 100644 misc/controller/mbus/install.sh
> delete mode 100755 misc/controller/mbus/mbus-cmd
> delete mode 100644 misc/controller/mbus/mbus.pm
> delete mode 100644 misc/controller/mbus/mbusconf.pm
> delete mode 100755 misc/controller/misc/log_i2c_ds1631_ecmd.sh
> delete mode 100755 misc/controller/misc/log_open2300.sh
> delete mode 100755 misc/controller/misc/log_rawS0.lua
> delete mode 100755 misc/controller/misc/log_rawS0.sh
> delete mode 100755 misc/controller/misc/log_usbflukso.sh
> delete mode 100755 misc/controller/misc/log_weather.sh
> delete mode 100644 misc/controller/misc/log_weather_wu.sh
> delete mode 160000 misc/frontend/fnordlicht
> delete mode 100644 misc/tools/aggregate.php
> delete mode 100755 misc/tools/doctrine
> delete mode 100644 test/AggregationPerformanceTest.php
> create mode 100644 test/InterpreterTrait.php
> create mode 100644 test/IotTest.php
> create mode 100644 test/PrognosisTest.php
> create mode 100644 test/QueryTest.php
> create mode 100644 test/VirtualTest.php
>
> ob die beiden rename-Exeptions relevant sind weiß ich nicht.
>
> Dann sollte jetzt ein Composer update folgen ?
>
> Also:
>
> # composer update
> Loading composer repositories with package information
> Updating dependencies (including require-dev)
>
>
> [ErrorException]
> "continue" targeting switch is equivalent to "break". Did you mean to use "continue 2"?
>
>
> update [--prefer-source] [--prefer-dist] [--dry-run] [--dev] [--no-dev] [--lock] [--no-plugins] [--no-custom-installers] [--no-autoloader] [--no-scripts] [--no-progress] [--with-dependencies] [-v|vv|vvv|--verbose] [-o|--optimize-autoloader] [-a|--classmap-authoritative] [--ignore-platform-reqs] [--prefer-stable] [--prefer-lowest] [-i|--interactive] [--root-reqs] [--] [<packages>]...
>
>
> Nach etwas googeln habe ich das hier gefunden :
> https://github.com/composer/composer/issues/7783#issuecomment-462306526
> und angewendet (Zeile 286 von „continue“ in „continue 2“ geändert.
>
> Danach musste ich noch „php-xml“ und „php-mbstring“ nachinstallieren und
> dann lief „composer update“ durch.
>
> root at ubserv:/var/www/volkszaehler.org# composer update
> Loading composer repositories with package information
> Updating dependencies (including require-dev)
> - Removing relay/relay (0.2.0)
> - Removing mkraemer/react-pcntl (v2.0.0)
> - Removing react/socket-client (v0.5.3)
> - Removing react/http-client (v0.4.17)
> - Removing phpunit/phpunit-mock-objects (3.4.3)
> - Removing jenssegers/proxy (v3.0.0-beta2)
> - Updating symfony/routing (v3.2.7 => v4.2.4)
> Checking out ff03eae644e6b1e26d4a04b2385fe3a1a7f04e42
> :
> :
> :
> - Installing webpatser/laravel-uuid (3.0.2)
> Downloading: 100%
>
> - Installing jdorn/sql-formatter (v1.2.17)
> Downloading: 100%
>
> symfony/contracts suggests installing psr/cache (When using the Cache contracts)
> symfony/contracts suggests installing psr/container (When using the Service contracts)
> symfony/contracts suggests installing symfony/cache-contracts-implementation ()
> symfony/contracts suggests installing symfony/service-contracts-implementation ()
> symfony/contracts suggests installing symfony/translation-contracts-implementation ()
> influxdb/influxdb-php suggests installing stefanotorresi/influxdb-php-async (An asyncronous client for InfluxDB, implemented via ReactPHP.)
> Package http-interop/http-middleware is abandoned, you should avoid using it. Use http-interop/http-server-middleware instead.
> Writing lock file
> Generating autoload files
> root at ubserv:/var/www/volkszaehler.org# service apache2 restart
>
>
>
> Leider geht das Frontend nicht.
> Es kommt nur das Grundbild und ein „Network error“.
>
> Was fehlt noch ?
> Was habe ich falsch gemacht ?
>
> Ich habe erst mal wieder auf den vor der Aktion erstellten Snapshot zurückgesetzt, damit mein System wieder läuft.
>
> MfG Ronald
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://demo.volkszaehler.org/pipermail/volkszaehler-users/attachments/20190322/327edd20/attachment-0001.html>
More information about the volkszaehler-users
mailing list